3 files changed, 40 insertions, 36 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index 966485b2..4a2187c3 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -1,48 +1,48 @@
 { "cas_client":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["cas_client"]
   , "srcs": ["bazel_cas_client.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test/utils", "catch-main-remote-execution"]
-    , ["src/buildtool/execution_api/remote", "bazel_network"]
-    , ["src/buildtool/execution_api/remote", "config"]
+    , ["utils", "catch-main-remote-execution"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "execution_client":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["execution_client"]
   , "srcs": ["bazel_execution_client.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test/utils", "catch-main-remote-execution"]
-    , ["test/utils", "execution_bazel"]
-    , ["src/buildtool/execution_api/remote", "bazel_network"]
+    , ["utils", "catch-main-remote-execution"]
+    , ["utils", "execution_bazel"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "bytestream_client":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["bytestream_client"]
   , "srcs": ["bytestream_client.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test/utils", "catch-main-remote-execution"]
-    , ["test/utils", "execution_bazel"]
-    , ["src/buildtool/execution_api/remote", "bazel_network"]
+    , ["utils", "catch-main-remote-execution"]
+    , ["utils", "execution_bazel"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "network":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["network"]
   , "srcs": ["bazel_network.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test/utils", "catch-main-remote-execution"]
-    , ["test/utils", "execution_bazel"]
-    , ["src/buildtool/execution_api/remote", "bazel_network"]
+    , ["utils", "catch-main-remote-execution"]
+    , ["utils", "execution_bazel"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
@@ -50,25 +50,29 @@
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["msg_factory"]
   , "srcs": ["bazel_msg_factory.test.cpp"]
-  , "data": [["test/buildtool/storage", "test_data"]]
+  , "data": [["buildtool/storage", "test_data"]]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
-    , ["src/buildtool/file_system", "object_type"]
+    , ["", "catch-main"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/execution_api/bazel_msg"
+      , "bazel_msg_factory"
+      ]
+    , ["@", "src", "src/buildtool/file_system", "object_type"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "bazel_api":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["bazel_api"]
   , "srcs": ["bazel_api.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test/utils", "catch-main-remote-execution"]
-    , ["src/buildtool/execution_api/remote", "bazel"]
-    , ["test/buildtool/execution_api/common", "api_test"]
+    , ["utils", "catch-main-remote-execution"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "bazel"]
+    , ["buildtool/execution_api/common", "api_test"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index abd7e3a3..b8039b02 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -4,9 +4,9 @@
   , "hdrs": ["api_test.hpp"]
   , "deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_api/common", "common"]
-    , ["src/buildtool/file_system", "file_system_manager"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_api/common", "common"]
+    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "common"]
   }
diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS
index c0131568..11e92a45 100644
--- a/test/buildtool/execution_api/local/TARGETS
+++ b/test/buildtool/execution_api/local/TARGETS
@@ -4,10 +4,10 @@
   , "srcs": ["local_execution.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_api/local", "local"]
-    , ["test/utils", "local_hermeticity"]
+    , ["", "catch-main"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_api/local", "local"]
+    , ["utils", "local_hermeticity"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "local"]
   }
@@ -17,10 +17,10 @@
   , "srcs": ["local_api.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["src/buildtool/execution_api/local", "local"]
-    , ["test/buildtool/execution_api/common", "api_test"]
-    , ["test/utils", "local_hermeticity"]
+    , ["", "catch-main"]
+    , ["@", "src", "src/buildtool/execution_api/local", "local"]
+    , ["buildtool/execution_api/common", "api_test"]
+    , ["utils", "local_hermeticity"]
     ]
   , "stage": ["test", "buildtool", "execution_api", "local"]
   }