4 files changed, 29 insertions, 29 deletions
diff --git a/test/other_tools/utils/TARGETS b/test/other_tools/utils/TARGETS
index d709b532..425015ce 100644
--- a/test/other_tools/utils/TARGETS
+++ b/test/other_tools/utils/TARGETS
@@ -12,6 +12,29 @@
     ]
   , "stage": ["test", "other_tools", "utils"]
   }
+, "curl_usage_install":
+  { "type": ["@", "rules", "CC", "binary"]
+  , "tainted": ["test"]
+  , "name": ["curl_usage"]
+  , "srcs": ["curl_usage.test.cpp"]
+  , "private-deps":
+    [ ["@", "catch2", "", "catch2"]
+    , ["test", "catch-main"]
+    , ["src/other_tools/utils", "curl_context"]
+    , ["src/other_tools/utils", "curl_easy_handle"]
+    , ["src/buildtool/file_system", "file_system_manager"]
+    ]
+  , "stage": ["test", "other_tools", "utils"]
+  }
+, "curl_usage_test":
+  { "type": ["@", "rules", "shell/test", "script"]
+  , "name": ["curl_usage_test"]
+  , "test": ["curl_usage_test.sh"]
+  , "deps": [["test/utils", "test_utils_install"], "curl_usage_install"]
+  }
 , "TESTS":
-  {"type": "install", "tainted": ["test"], "deps": ["archive_usage"]}
-}
-\ No newline at end of file
+  { "type": "install"
+  , "tainted": ["test"]
+  , "deps": ["archive_usage", "curl_usage_test"]
+  }
+}
diff --git a/test/utils/cpp/curl_usage.test.cpp b/test/other_tools/utils/curl_usage.test.cpp
index dc6666d4..eaa84c7d 100644
--- a/test/utils/cpp/curl_usage.test.cpp
+++ b/test/other_tools/utils/curl_usage.test.cpp
@@ -14,8 +14,8 @@
 
 #include "catch2/catch.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
-#include "src/utils/cpp/curl_context.hpp"
-#include "src/utils/cpp/curl_easy_handle.hpp"
+#include "src/other_tools/utils/curl_context.hpp"
+#include "src/other_tools/utils/curl_easy_handle.hpp"
 
 // The caller of this test needs to make sure the port is given as content of
 // the file "port.txt" in the directory where this test is run
diff --git a/test/utils/cpp/curl_usage_test.sh b/test/other_tools/utils/curl_usage_test.sh
index 3ff874cb..838b5c17 100644
--- a/test/utils/cpp/curl_usage_test.sh
+++ b/test/other_tools/utils/curl_usage_test.sh
@@ -48,7 +48,7 @@ cd "${ROOT}"
 
 echo "Run curl usage test"
 error=false
-test/utils/cpp/curl_usage & res=$!
+test/other_tools/utils/curl_usage & res=$!
 wait $res
 if [ $? -ne 0 ]; then
     error=true
diff --git a/test/utils/cpp/TARGETS b/test/utils/cpp/TARGETS
index 05e344cd..9da792dc 100644
--- a/test/utils/cpp/TARGETS
+++ b/test/utils/cpp/TARGETS
@@ -9,26 +9,6 @@
     ]
   , "stage": ["test", "utils", "cpp"]
   }
-, "curl_usage_install":
-  { "type": ["@", "rules", "CC", "binary"]
-  , "tainted": ["test"]
-  , "name": ["curl_usage"]
-  , "srcs": ["curl_usage.test.cpp"]
-  , "private-deps":
-    [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["src/utils/cpp", "curl_context"]
-    , ["src/utils/cpp", "curl_easy_handle"]
-    , ["src/buildtool/file_system", "file_system_manager"]
-    ]
-  , "stage": ["test", "utils", "cpp"]
-  }
-, "curl_usage_test":
-  { "type": ["@", "rules", "shell/test", "script"]
-  , "name": ["curl_usage_test"]
-  , "test": ["curl_usage_test.sh"]
-  , "deps": [["test/utils", "test_utils_install"], "curl_usage_install"]
-  }
 , "file_locking":
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["file_locking"]
@@ -43,8 +23,5 @@
   , "stage": ["test", "utils", "cpp"]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
-  , "deps": ["path", "curl_usage_test", "file_locking"]
-  }
+  {"type": "install", "tainted": ["test"], "deps": ["path", "file_locking"]}
 }