diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json b/tests/repository_data/client/test_repository1/metadata/current/1.root.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/1.root.json
rename to tests/repository_data/client/test_repository1/metadata/current/1.root.json
diff --git a/tests/repository_data/client/test_repository/metadata/current/role1.json b/tests/repository_data/client/test_repository1/metadata/current/role1.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/role1.json
rename to tests/repository_data/client/test_repository1/metadata/current/role1.json
diff --git a/tests/repository_data/client/test_repository/metadata/current/role2.json b/tests/repository_data/client/test_repository1/metadata/current/role2.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/role2.json
rename to tests/repository_data/client/test_repository1/metadata/current/role2.json
diff --git a/tests/repository_data/client/test_repository/metadata/current/root.json b/tests/repository_data/client/test_repository1/metadata/current/root.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/root.json
rename to tests/repository_data/client/test_repository1/metadata/current/root.json
diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json b/tests/repository_data/client/test_repository1/metadata/current/snapshot.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/snapshot.json
rename to tests/repository_data/client/test_repository1/metadata/current/snapshot.json
diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json b/tests/repository_data/client/test_repository1/metadata/current/targets.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/targets.json
rename to tests/repository_data/client/test_repository1/metadata/current/targets.json
diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json b/tests/repository_data/client/test_repository1/metadata/current/timestamp.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/current/timestamp.json
rename to tests/repository_data/client/test_repository1/metadata/current/timestamp.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json b/tests/repository_data/client/test_repository1/metadata/previous/1.root.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/1.root.json
rename to tests/repository_data/client/test_repository1/metadata/previous/1.root.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/role1.json b/tests/repository_data/client/test_repository1/metadata/previous/role1.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/role1.json
rename to tests/repository_data/client/test_repository1/metadata/previous/role1.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/role2.json b/tests/repository_data/client/test_repository1/metadata/previous/role2.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/role2.json
rename to tests/repository_data/client/test_repository1/metadata/previous/role2.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/root.json b/tests/repository_data/client/test_repository1/metadata/previous/root.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/root.json
rename to tests/repository_data/client/test_repository1/metadata/previous/root.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json b/tests/repository_data/client/test_repository1/metadata/previous/snapshot.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/snapshot.json
rename to tests/repository_data/client/test_repository1/metadata/previous/snapshot.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json b/tests/repository_data/client/test_repository1/metadata/previous/targets.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/targets.json
rename to tests/repository_data/client/test_repository1/metadata/previous/targets.json
diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json b/tests/repository_data/client/test_repository1/metadata/previous/timestamp.json
similarity index 100%
rename from tests/repository_data/client/test_repository/metadata/previous/timestamp.json
rename to tests/repository_data/client/test_repository1/metadata/previous/timestamp.json
diff --git a/tests/repository_data/client/test_repository2/metadata/current/1.root.json b/tests/repository_data/client/test_repository2/metadata/current/1.root.json
new file mode 100644
index 00000000..ccce5381
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/1.root.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/current/role1.json b/tests/repository_data/client/test_repository2/metadata/current/role1.json
new file mode 100644
index 00000000..332cd805
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/role1.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/current/role2.json b/tests/repository_data/client/test_repository2/metadata/current/role2.json
new file mode 100644
index 00000000..46e415a7
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/role2.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/current/root.json b/tests/repository_data/client/test_repository2/metadata/current/root.json
new file mode 100644
index 00000000..ccce5381
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/root.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/current/snapshot.json b/tests/repository_data/client/test_repository2/metadata/current/snapshot.json
new file mode 100644
index 00000000..a713f807
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/snapshot.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/current/targets.json b/tests/repository_data/client/test_repository2/metadata/current/targets.json
new file mode 100644
index 00000000..972034d0
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/targets.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/current/timestamp.json b/tests/repository_data/client/test_repository2/metadata/current/timestamp.json
new file mode 100644
index 00000000..2cc752b3
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/current/timestamp.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/1.root.json b/tests/repository_data/client/test_repository2/metadata/previous/1.root.json
new file mode 100644
index 00000000..ccce5381
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/1.root.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/role1.json b/tests/repository_data/client/test_repository2/metadata/previous/role1.json
new file mode 100644
index 00000000..332cd805
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/role1.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/role2.json b/tests/repository_data/client/test_repository2/metadata/previous/role2.json
new file mode 100644
index 00000000..46e415a7
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/role2.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/root.json b/tests/repository_data/client/test_repository2/metadata/previous/root.json
new file mode 100644
index 00000000..ccce5381
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/root.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/snapshot.json b/tests/repository_data/client/test_repository2/metadata/previous/snapshot.json
new file mode 100644
index 00000000..a713f807
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/snapshot.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/targets.json b/tests/repository_data/client/test_repository2/metadata/previous/targets.json
new file mode 100644
index 00000000..972034d0
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/targets.json differ
diff --git a/tests/repository_data/client/test_repository2/metadata/previous/timestamp.json b/tests/repository_data/client/test_repository2/metadata/previous/timestamp.json
new file mode 100644
index 00000000..2cc752b3
Binary files /dev/null and b/tests/repository_data/client/test_repository2/metadata/previous/timestamp.json differ