diff --git a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar
index 1be3f74ada3..9327d317f3a 100644
Binary files a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar and b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar differ
diff --git a/gix-diff/tests/fixtures/generated-archives/make_diff_repo_a.tar b/gix-diff/tests/fixtures/generated-archives/make_diff_repo_a.tar
new file mode 100644
index 00000000000..0a6bbf5031b
Binary files /dev/null and b/gix-diff/tests/fixtures/generated-archives/make_diff_repo_a.tar differ
diff --git a/gix-filter/tests/driver/mod.rs b/gix-filter/tests/driver/mod.rs
index b1b4a49efe3..e4ba5cbbe9c 100644
--- a/gix-filter/tests/driver/mod.rs
+++ b/gix-filter/tests/driver/mod.rs
@@ -11,7 +11,7 @@ mod baseline {
         if cfg!(windows) {
             exe = exe.replace('\\', "/");
         }
-        gix_testtools::scripted_fixture_read_only_with_args("baseline.sh", [exe])?;
+        gix_testtools::scripted_fixture_read_only_with_args_single_archive("baseline.sh", [exe])?;
         Ok(())
     }
 }
diff --git a/gix-ref/tests/fixtures/generated-archives/make_worktree_repo_packed.tar b/gix-ref/tests/fixtures/generated-archives/make_worktree_repo_packed.tar
new file mode 100644
index 00000000000..0d79b31d23f
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_worktree_repo_packed.tar differ
diff --git a/gix/src/remote/connection/fetch/update_refs/tests.rs b/gix/src/remote/connection/fetch/update_refs/tests.rs
index fbe5e2fcd17..4abf82f1aa0 100644
--- a/gix/src/remote/connection/fetch/update_refs/tests.rs
+++ b/gix/src/remote/connection/fetch/update_refs/tests.rs
@@ -25,8 +25,11 @@ mod update {
     }
 
     fn repo(name: &str) -> gix::Repository {
-        let dir =
-            gix_testtools::scripted_fixture_read_only_with_args("make_fetch_repos.sh", [base_repo_path()]).unwrap();
+        let dir = gix_testtools::scripted_fixture_read_only_with_args_single_archive(
+            "make_fetch_repos.sh",
+            [base_repo_path()],
+        )
+        .unwrap();
         gix::open_opts(dir.join(name), restricted()).unwrap()
     }
     fn named_repo(name: &str) -> gix::Repository {
@@ -34,7 +37,7 @@ mod update {
         gix::open_opts(dir.join(name), restricted()).unwrap()
     }
     fn repo_rw(name: &str) -> (gix::Repository, gix_testtools::tempfile::TempDir) {
-        let dir = gix_testtools::scripted_fixture_writable_with_args(
+        let dir = gix_testtools::scripted_fixture_writable_with_args_single_archive(
             "make_fetch_repos.sh",
             [base_repo_path()],
             gix_testtools::Creation::ExecuteScript,
@@ -189,7 +192,7 @@ mod update {
 
     #[test]
     fn checked_out_branches_in_worktrees_are_rejected_with_additional_information() -> Result {
-        let root = gix_path::realpath(gix_testtools::scripted_fixture_read_only_with_args(
+        let root = gix_path::realpath(gix_testtools::scripted_fixture_read_only_with_args_single_archive(
             "make_fetch_repos.sh",
             [base_repo_path()],
         )?)?;
diff --git a/gix/tests/fixtures/generated-archives/make_worktree_repo_bare.tar b/gix/tests/fixtures/generated-archives/make_worktree_repo_bare.tar
new file mode 100644
index 00000000000..f95d4bba03e
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_worktree_repo_bare.tar differ
diff --git a/gix/tests/remote/fetch.rs b/gix/tests/remote/fetch.rs
index 301c31f0f81..6a5a5eb72ae 100644
--- a/gix/tests/remote/fetch.rs
+++ b/gix/tests/remote/fetch.rs
@@ -63,7 +63,7 @@ mod blocking_and_async_io {
         args: impl IntoIterator<Item = S>,
         mode: Mode,
     ) -> Result<(gix::Repository, gix_testtools::tempfile::TempDir), gix::open::Error> {
-        let dir = gix_testtools::scripted_fixture_writable_with_args(
+        let dir = gix_testtools::scripted_fixture_writable_with_args_single_archive(
             "make_fetch_repos.sh",
             [{
                 let mut url = base_repo_path();
diff --git a/gix/tests/repository/shallow.rs b/gix/tests/repository/shallow.rs
index 8e5c2bd0a66..1a27753fdde 100644
--- a/gix/tests/repository/shallow.rs
+++ b/gix/tests/repository/shallow.rs
@@ -72,7 +72,7 @@ mod traverse {
     #[parallel]
     fn complex_graphs_can_be_iterated_despite_multiple_shallow_boundaries() -> crate::Result {
         let base = gix_path::realpath(gix_testtools::scripted_fixture_read_only("make_remote_repos.sh")?.join("base"))?;
-        let shallow_base = gix_testtools::scripted_fixture_read_only_with_args(
+        let shallow_base = gix_testtools::scripted_fixture_read_only_with_args_single_archive(
             "make_complex_shallow_repo.sh",
             Some(base.to_string_lossy()),
         )?;