diff --git a/tests/repository_data/client/metadata/current/root.json.gz b/tests/repository_data/client/metadata/current/root.json.gz
deleted file mode 100644
index b4c12d14..00000000
Binary files a/tests/repository_data/client/metadata/current/root.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/current/snapshot.json.gz b/tests/repository_data/client/metadata/current/snapshot.json.gz
deleted file mode 100644
index 88aa0f12..00000000
Binary files a/tests/repository_data/client/metadata/current/snapshot.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/current/timestamp.json.gz b/tests/repository_data/client/metadata/current/timestamp.json.gz
deleted file mode 100644
index f5947694..00000000
Binary files a/tests/repository_data/client/metadata/current/timestamp.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/previous/root.json.gz b/tests/repository_data/client/metadata/previous/root.json.gz
deleted file mode 100644
index b4c12d14..00000000
Binary files a/tests/repository_data/client/metadata/previous/root.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/previous/snapshot.json.gz b/tests/repository_data/client/metadata/previous/snapshot.json.gz
deleted file mode 100644
index 88aa0f12..00000000
Binary files a/tests/repository_data/client/metadata/previous/snapshot.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/metadata/previous/timestamp.json.gz b/tests/repository_data/client/metadata/previous/timestamp.json.gz
deleted file mode 100644
index f5947694..00000000
Binary files a/tests/repository_data/client/metadata/previous/timestamp.json.gz and /dev/null differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json b/tests/repository_data/client/test_repository/metadata/current/1.root.json
new file mode 100644
index 00000000..7835711f
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/current/1.root.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz
new file mode 100644
index 00000000..741b2d29
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/role1.json b/tests/repository_data/client/test_repository/metadata/current/role1.json
similarity index 100%
rename from tests/repository_data/client/metadata/current/role1.json
rename to tests/repository_data/client/test_repository/metadata/current/role1.json
diff --git a/tests/repository_data/client/metadata/current/role1.json.gz b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz
similarity index 89%
rename from tests/repository_data/client/metadata/current/role1.json.gz
rename to tests/repository_data/client/test_repository/metadata/current/role1.json.gz
index e2fd36f0..33bdf2ea 100644
Binary files a/tests/repository_data/client/metadata/current/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/role2.json b/tests/repository_data/client/test_repository/metadata/current/role2.json
similarity index 100%
rename from tests/repository_data/client/metadata/current/role2.json
rename to tests/repository_data/client/test_repository/metadata/current/role2.json
diff --git a/tests/repository_data/client/metadata/previous/role2.json.gz b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz
similarity index 92%
rename from tests/repository_data/client/metadata/previous/role2.json.gz
rename to tests/repository_data/client/test_repository/metadata/current/role2.json.gz
index 6074f9bd..3d23a94c 100644
Binary files a/tests/repository_data/client/metadata/previous/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/root.json b/tests/repository_data/client/test_repository/metadata/current/root.json
similarity index 76%
rename from tests/repository_data/client/metadata/previous/root.json
rename to tests/repository_data/client/test_repository/metadata/current/root.json
index ab8e8dc8..7835711f 100644
Binary files a/tests/repository_data/client/metadata/previous/root.json and b/tests/repository_data/client/test_repository/metadata/current/root.json differ
diff --git a/tests/repository_data/client/metadata/current/snapshot.json b/tests/repository_data/client/test_repository/metadata/current/snapshot.json
similarity index 67%
rename from tests/repository_data/client/metadata/current/snapshot.json
rename to tests/repository_data/client/test_repository/metadata/current/snapshot.json
index bf565452..3ee5468c 100644
Binary files a/tests/repository_data/client/metadata/current/snapshot.json and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz
new file mode 100644
index 00000000..a57d0051
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/targets.json b/tests/repository_data/client/test_repository/metadata/current/targets.json
similarity index 100%
rename from tests/repository_data/client/metadata/current/targets.json
rename to tests/repository_data/client/test_repository/metadata/current/targets.json
diff --git a/tests/repository_data/client/metadata/current/targets.json.gz b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz
similarity index 92%
rename from tests/repository_data/client/metadata/current/targets.json.gz
rename to tests/repository_data/client/test_repository/metadata/current/targets.json.gz
index 0753ea69..5a519066 100644
Binary files a/tests/repository_data/client/metadata/current/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/timestamp.json b/tests/repository_data/client/test_repository/metadata/current/timestamp.json
similarity index 59%
rename from tests/repository_data/client/metadata/current/timestamp.json
rename to tests/repository_data/client/test_repository/metadata/current/timestamp.json
index 3f44ae97..43adf289 100644
Binary files a/tests/repository_data/client/metadata/current/timestamp.json and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz
new file mode 100644
index 00000000..ac8247df
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json b/tests/repository_data/client/test_repository/metadata/previous/1.root.json
new file mode 100644
index 00000000..7835711f
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/previous/1.root.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz
new file mode 100644
index 00000000..741b2d29
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/role1.json b/tests/repository_data/client/test_repository/metadata/previous/role1.json
similarity index 100%
rename from tests/repository_data/client/metadata/previous/role1.json
rename to tests/repository_data/client/test_repository/metadata/previous/role1.json
diff --git a/tests/repository_data/client/metadata/previous/role1.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz
similarity index 89%
rename from tests/repository_data/client/metadata/previous/role1.json.gz
rename to tests/repository_data/client/test_repository/metadata/previous/role1.json.gz
index e2fd36f0..33bdf2ea 100644
Binary files a/tests/repository_data/client/metadata/previous/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/role2.json b/tests/repository_data/client/test_repository/metadata/previous/role2.json
similarity index 100%
rename from tests/repository_data/client/metadata/previous/role2.json
rename to tests/repository_data/client/test_repository/metadata/previous/role2.json
diff --git a/tests/repository_data/client/metadata/current/role2.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz
similarity index 92%
rename from tests/repository_data/client/metadata/current/role2.json.gz
rename to tests/repository_data/client/test_repository/metadata/previous/role2.json.gz
index 6074f9bd..3d23a94c 100644
Binary files a/tests/repository_data/client/metadata/current/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz differ
diff --git a/tests/repository_data/client/metadata/current/root.json b/tests/repository_data/client/test_repository/metadata/previous/root.json
similarity index 76%
rename from tests/repository_data/client/metadata/current/root.json
rename to tests/repository_data/client/test_repository/metadata/previous/root.json
index ab8e8dc8..7835711f 100644
Binary files a/tests/repository_data/client/metadata/current/root.json and b/tests/repository_data/client/test_repository/metadata/previous/root.json differ
diff --git a/tests/repository_data/client/metadata/previous/snapshot.json b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json
similarity index 67%
rename from tests/repository_data/client/metadata/previous/snapshot.json
rename to tests/repository_data/client/test_repository/metadata/previous/snapshot.json
index bf565452..3ee5468c 100644
Binary files a/tests/repository_data/client/metadata/previous/snapshot.json and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz
new file mode 100644
index 00000000..a57d0051
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/targets.json b/tests/repository_data/client/test_repository/metadata/previous/targets.json
similarity index 100%
rename from tests/repository_data/client/metadata/previous/targets.json
rename to tests/repository_data/client/test_repository/metadata/previous/targets.json
diff --git a/tests/repository_data/client/metadata/previous/targets.json.gz b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz
similarity index 92%
rename from tests/repository_data/client/metadata/previous/targets.json.gz
rename to tests/repository_data/client/test_repository/metadata/previous/targets.json.gz
index 0753ea69..5a519066 100644
Binary files a/tests/repository_data/client/metadata/previous/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz differ
diff --git a/tests/repository_data/client/metadata/previous/timestamp.json b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json
similarity index 59%
rename from tests/repository_data/client/metadata/previous/timestamp.json
rename to tests/repository_data/client/test_repository/metadata/previous/timestamp.json
index 3f44ae97..43adf289 100644
Binary files a/tests/repository_data/client/metadata/previous/timestamp.json and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json differ
diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz
new file mode 100644
index 00000000..ac8247df
Binary files /dev/null and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz differ
diff --git a/tests/repository_data/generate.py b/tests/repository_data/generate.py
index ef0c2f9a..27975e5c 100755
--- a/tests/repository_data/generate.py
+++ b/tests/repository_data/generate.py
@@ -157,4 +157,4 @@
 # Create the client files (required directory structure and minimal metadata)
 # required by the 'tuf.interposition' and 'tuf.client.updater.py' updaters.
 if not options.dry_run:
-  create_tuf_client_directory('repository', 'client')
+  create_tuf_client_directory('repository', os.path.join('client', 'test_repository'))
diff --git a/tests/repository_data/repository/metadata.staged/1.root.json b/tests/repository_data/repository/metadata.staged/1.root.json
index 94327a11..7835711f 100644
Binary files a/tests/repository_data/repository/metadata.staged/1.root.json and b/tests/repository_data/repository/metadata.staged/1.root.json differ
diff --git a/tests/repository_data/repository/metadata.staged/1.root.json.gz b/tests/repository_data/repository/metadata.staged/1.root.json.gz
index 4a13f7ef..741b2d29 100644
Binary files a/tests/repository_data/repository/metadata.staged/1.root.json.gz and b/tests/repository_data/repository/metadata.staged/1.root.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/role1.json.gz b/tests/repository_data/repository/metadata.staged/role1.json.gz
index e2fd36f0..33bdf2ea 100644
Binary files a/tests/repository_data/repository/metadata.staged/role1.json.gz and b/tests/repository_data/repository/metadata.staged/role1.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/role2.json.gz b/tests/repository_data/repository/metadata.staged/role2.json.gz
index 6074f9bd..3d23a94c 100644
Binary files a/tests/repository_data/repository/metadata.staged/role2.json.gz and b/tests/repository_data/repository/metadata.staged/role2.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/root.json b/tests/repository_data/repository/metadata.staged/root.json
index ab8e8dc8..7835711f 100644
Binary files a/tests/repository_data/repository/metadata.staged/root.json and b/tests/repository_data/repository/metadata.staged/root.json differ
diff --git a/tests/repository_data/repository/metadata.staged/root.json.gz b/tests/repository_data/repository/metadata.staged/root.json.gz
deleted file mode 100644
index b4c12d14..00000000
Binary files a/tests/repository_data/repository/metadata.staged/root.json.gz and /dev/null differ
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json b/tests/repository_data/repository/metadata.staged/snapshot.json
index bf565452..3ee5468c 100644
Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json and b/tests/repository_data/repository/metadata.staged/snapshot.json differ
diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json.gz b/tests/repository_data/repository/metadata.staged/snapshot.json.gz
index 88aa0f12..a57d0051 100644
Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json.gz and b/tests/repository_data/repository/metadata.staged/snapshot.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/targets.json.gz b/tests/repository_data/repository/metadata.staged/targets.json.gz
index 0753ea69..5a519066 100644
Binary files a/tests/repository_data/repository/metadata.staged/targets.json.gz and b/tests/repository_data/repository/metadata.staged/targets.json.gz differ
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json b/tests/repository_data/repository/metadata.staged/timestamp.json
index 3f44ae97..43adf289 100644
Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json and b/tests/repository_data/repository/metadata.staged/timestamp.json differ
diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json.gz b/tests/repository_data/repository/metadata.staged/timestamp.json.gz
index f5947694..ac8247df 100644
Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json.gz and b/tests/repository_data/repository/metadata.staged/timestamp.json.gz differ
diff --git a/tests/repository_data/repository/metadata/1.root.json b/tests/repository_data/repository/metadata/1.root.json
index 94327a11..7835711f 100644
Binary files a/tests/repository_data/repository/metadata/1.root.json and b/tests/repository_data/repository/metadata/1.root.json differ
diff --git a/tests/repository_data/repository/metadata/1.root.json.gz b/tests/repository_data/repository/metadata/1.root.json.gz
index 4a13f7ef..741b2d29 100644
Binary files a/tests/repository_data/repository/metadata/1.root.json.gz and b/tests/repository_data/repository/metadata/1.root.json.gz differ
diff --git a/tests/repository_data/repository/metadata/role1.json.gz b/tests/repository_data/repository/metadata/role1.json.gz
index e2fd36f0..33bdf2ea 100644
Binary files a/tests/repository_data/repository/metadata/role1.json.gz and b/tests/repository_data/repository/metadata/role1.json.gz differ
diff --git a/tests/repository_data/repository/metadata/role2.json.gz b/tests/repository_data/repository/metadata/role2.json.gz
index 6074f9bd..3d23a94c 100644
Binary files a/tests/repository_data/repository/metadata/role2.json.gz and b/tests/repository_data/repository/metadata/role2.json.gz differ
diff --git a/tests/repository_data/repository/metadata/root.json b/tests/repository_data/repository/metadata/root.json
index ab8e8dc8..7835711f 100644
Binary files a/tests/repository_data/repository/metadata/root.json and b/tests/repository_data/repository/metadata/root.json differ
diff --git a/tests/repository_data/repository/metadata/root.json.gz b/tests/repository_data/repository/metadata/root.json.gz
deleted file mode 100644
index b4c12d14..00000000
Binary files a/tests/repository_data/repository/metadata/root.json.gz and /dev/null differ
diff --git a/tests/repository_data/repository/metadata/snapshot.json b/tests/repository_data/repository/metadata/snapshot.json
index bf565452..3ee5468c 100644
Binary files a/tests/repository_data/repository/metadata/snapshot.json and b/tests/repository_data/repository/metadata/snapshot.json differ
diff --git a/tests/repository_data/repository/metadata/snapshot.json.gz b/tests/repository_data/repository/metadata/snapshot.json.gz
index 88aa0f12..a57d0051 100644
Binary files a/tests/repository_data/repository/metadata/snapshot.json.gz and b/tests/repository_data/repository/metadata/snapshot.json.gz differ
diff --git a/tests/repository_data/repository/metadata/targets.json.gz b/tests/repository_data/repository/metadata/targets.json.gz
index 0753ea69..5a519066 100644
Binary files a/tests/repository_data/repository/metadata/targets.json.gz and b/tests/repository_data/repository/metadata/targets.json.gz differ
diff --git a/tests/repository_data/repository/metadata/timestamp.json b/tests/repository_data/repository/metadata/timestamp.json
index 3f44ae97..43adf289 100644
Binary files a/tests/repository_data/repository/metadata/timestamp.json and b/tests/repository_data/repository/metadata/timestamp.json differ
diff --git a/tests/repository_data/repository/metadata/timestamp.json.gz b/tests/repository_data/repository/metadata/timestamp.json.gz
index f5947694..ac8247df 100644
Binary files a/tests/repository_data/repository/metadata/timestamp.json.gz and b/tests/repository_data/repository/metadata/timestamp.json.gz differ