3 files changed, 28 insertions, 28 deletions
diff --git a/test/buildtool/execution_engine/dag/TARGETS b/test/buildtool/execution_engine/dag/TARGETS
index 95dff1fe..a6ac316a 100644
--- a/test/buildtool/execution_engine/dag/TARGETS
+++ b/test/buildtool/execution_engine/dag/TARGETS
@@ -4,10 +4,10 @@
   , "srcs": ["dag.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["test/utils", "container_matchers"]
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_engine/dag", "dag"]
+    , ["", "catch-main"]
+    , ["utils", "container_matchers"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
     ]
   , "stage": ["test", "buildtool", "execution_engine", "dag"]
   }
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index e9f2bccd..a3e97d89 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -9,45 +9,45 @@
   , "name": ["executor"]
   , "srcs": ["executor.test.cpp"]
   , "private-deps":
-    [ ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_api/common", "common"]
-    , ["src/buildtool/execution_engine/dag", "dag"]
-    , ["src/buildtool/execution_engine/executor", "executor"]
-    , ["test", "catch-main"]
+    [ ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_api/common", "common"]
+    , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
+    , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
+    , ["", "catch-main"]
     , ["@", "catch2", "", "catch2"]
     ]
   , "stage": ["test", "buildtool", "execution_engine", "executor"]
   }
 , "local":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["local"]
   , "srcs": ["executor_api_local.test.cpp"]
   , "data": ["test_data"]
   , "private-deps":
     [ "executor_api_tests"
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_api/local", "local"]
-    , ["src/buildtool/execution_api/remote", "config"]
-    , ["src/buildtool/execution_engine/dag", "dag"]
-    , ["src/buildtool/execution_engine/executor", "executor"]
-    , ["test/utils", "catch-main-remote-execution"]
-    , ["test/utils", "local_hermeticity"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_api/local", "local"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
+    , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
+    , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
+    , ["utils", "catch-main-remote-execution"]
+    , ["utils", "local_hermeticity"]
     , ["@", "catch2", "", "catch2"]
     ]
   , "stage": ["test", "buildtool", "execution_engine", "executor"]
   }
 , "remote_bazel":
-  { "type": ["test/utils/remote_execution", "CC test"]
+  { "type": ["utils/remote_execution", "CC test"]
   , "name": ["remote_bazel"]
   , "srcs": ["executor_api_remote_bazel.test.cpp"]
   , "data": ["test_data"]
   , "private-deps":
     [ "executor_api_tests"
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_api/remote", "bazel"]
-    , ["src/buildtool/execution_api/remote", "config"]
-    , ["src/buildtool/execution_engine/executor", "executor"]
-    , ["test/utils", "catch-main-remote-execution"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "bazel"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
+    , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
+    , ["utils", "catch-main-remote-execution"]
     , ["@", "catch2", "", "catch2"]
     ]
   , "stage": ["test", "buildtool", "execution_engine", "executor"]
diff --git a/test/buildtool/execution_engine/traverser/TARGETS b/test/buildtool/execution_engine/traverser/TARGETS
index 2b9ced2d..9f1e1387 100644
--- a/test/buildtool/execution_engine/traverser/TARGETS
+++ b/test/buildtool/execution_engine/traverser/TARGETS
@@ -4,11 +4,11 @@
   , "srcs": ["traverser.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["test/utils", "container_matchers"]
-    , ["src/buildtool/common", "artifact_factory"]
-    , ["src/buildtool/execution_engine/dag", "dag"]
-    , ["src/buildtool/execution_engine/traverser", "traverser"]
+    , ["", "catch-main"]
+    , ["utils", "container_matchers"]
+    , ["@", "src", "src/buildtool/common", "artifact_factory"]
+    , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
+    , ["@", "src", "src/buildtool/execution_engine/traverser", "traverser"]
     ]
   , "stage": ["test", "buildtool", "execution_engine", "traverser"]
   }