6 files changed, 22 insertions, 22 deletions
diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS
index 23ad1062..f8a8d10d 100644
--- a/test/end-to-end/just-mr/TARGETS
+++ b/test/end-to-end/just-mr/TARGETS
@@ -25,7 +25,7 @@
   , "private-deps":
     [ ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/logging", "logging"]
-    , ["@", "src", "src/other_tools/utils", "archive_ops"]
+    , ["@", "src", "src/utils/archive", "archive_ops"]
     , ["@", "src", "src/utils/cpp", "tmp_dir"]
     ]
   , "private-ldflags": ["-pthread"]
diff --git a/test/end-to-end/just-mr/create_test_archives.cpp b/test/end-to-end/just-mr/create_test_archives.cpp
index f7223410..5f50bade 100644
--- a/test/end-to-end/just-mr/create_test_archives.cpp
+++ b/test/end-to-end/just-mr/create_test_archives.cpp
@@ -17,7 +17,7 @@
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/logging/log_config.hpp"
 #include "src/buildtool/logging/log_sink_cmdline.hpp"
-#include "src/other_tools/utils/archive_ops.hpp"
+#include "src/utils/archive/archive_ops.hpp"
 #include "src/utils/cpp/tmp_dir.hpp"
 
 namespace {
diff --git a/test/other_tools/utils/TARGETS b/test/other_tools/utils/TARGETS
index 11bb619b..b43788f1 100644
--- a/test/other_tools/utils/TARGETS
+++ b/test/other_tools/utils/TARGETS
@@ -1,17 +1,4 @@
-{ "archive_usage":
-  { "type": ["@", "rules", "CC/test", "test"]
-  , "name": ["archive_usage"]
-  , "srcs": ["archive_usage.test.cpp"]
-  , "private-deps":
-    [ ["@", "catch2", "", "catch2"]
-    , ["", "catch-main"]
-    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
-    , ["@", "src", "", "libarchive"]
-    , ["@", "src", "src/other_tools/utils", "archive_ops"]
-    ]
-  , "stage": ["test", "other_tools", "utils"]
-  }
-, "curl_usage_install":
+{ "curl_usage_install":
   { "type": ["@", "rules", "CC", "binary"]
   , "tainted": ["test"]
   , "name": ["curl_usage_install"]
@@ -43,8 +30,5 @@
   , "stage": ["test", "other_tools", "utils"]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
-  , "deps": ["archive_usage", "curl_usage", "curl_url"]
-  }
+  {"type": "install", "tainted": ["test"], "deps": ["curl_usage", "curl_url"]}
 }
diff --git a/test/utils/TARGETS b/test/utils/TARGETS
index 2a6f99d0..94fb936f 100644
--- a/test/utils/TARGETS
+++ b/test/utils/TARGETS
@@ -92,6 +92,7 @@
 , "TESTS":
   { "type": "install"
   , "tainted": ["test"]
-  , "dirs": [[["./", "cpp", "TESTS"], "cpp"]]
+  , "dirs":
+    [[["./", "cpp", "TESTS"], "cpp"], [["./", "archive", "TESTS"], "archive"]]
   }
 }
diff --git a/test/utils/archive/TARGETS b/test/utils/archive/TARGETS
new file mode 100644
index 00000000..15b849c5
--- /dev/null
+++ b/test/utils/archive/TARGETS
@@ -0,0 +1,15 @@
+{ "archive_usage":
+  { "type": ["@", "rules", "CC/test", "test"]
+  , "name": ["archive_usage"]
+  , "srcs": ["archive_usage.test.cpp"]
+  , "private-deps":
+    [ ["@", "catch2", "", "catch2"]
+    , ["", "catch-main"]
+    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
+    , ["@", "src", "", "libarchive"]
+    , ["@", "src", "src/utils/archive", "archive_ops"]
+    ]
+  , "stage": ["test", "utils", "archive"]
+  }
+, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["archive_usage"]}
+}
diff --git a/test/other_tools/utils/archive_usage.test.cpp b/test/utils/archive/archive_usage.test.cpp
index 09d080c5..6a8eb751 100644
--- a/test/other_tools/utils/archive_usage.test.cpp
+++ b/test/utils/archive/archive_usage.test.cpp
@@ -19,7 +19,7 @@
 #include "catch2/catch_test_macros.hpp"
 #include "catch2/generators/catch_generators_all.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
-#include "src/other_tools/utils/archive_ops.hpp"
+#include "src/utils/archive/archive_ops.hpp"
 
 extern "C" {
 #include <archive.h>