3 files changed, 9 insertions, 9 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index 6f32e64d..26026139 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -1,5 +1,5 @@
 { "ac_client":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["ac_client"]
   , "srcs": ["bazel_ac_client.test.cpp"]
   , "private-deps":
@@ -11,7 +11,7 @@
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "cas_client":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["cas_client"]
   , "srcs": ["bazel_cas_client.test.cpp"]
   , "private-deps":
@@ -23,7 +23,7 @@
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "execution_client":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["execution_client"]
   , "srcs": ["bazel_execution_client.test.cpp"]
   , "private-deps":
@@ -35,7 +35,7 @@
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "bytestream_client":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["bytestream_client"]
   , "srcs": ["bytestream_client.test.cpp"]
   , "private-deps":
@@ -47,7 +47,7 @@
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "network":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["network"]
   , "srcs": ["bazel_network.test.cpp"]
   , "private-deps":
@@ -73,7 +73,7 @@
   , "stage": ["test", "buildtool", "execution_api", "bazel"]
   }
 , "bazel_api":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["bazel_api"]
   , "srcs": ["bazel_api.test.cpp"]
   , "private-deps":
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index 75f7d385..e9f2bccd 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -19,7 +19,7 @@
   , "stage": ["test", "buildtool", "execution_engine", "executor"]
   }
 , "local":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["local"]
   , "srcs": ["executor_api_local.test.cpp"]
   , "data": ["test_data"]
@@ -37,7 +37,7 @@
   , "stage": ["test", "buildtool", "execution_engine", "executor"]
   }
 , "remote_bazel":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["remote_bazel"]
   , "srcs": ["executor_api_remote_bazel.test.cpp"]
   , "data": ["test_data"]
diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS
index 302c68e0..db9d532e 100644
--- a/test/buildtool/graph_traverser/TARGETS
+++ b/test/buildtool/graph_traverser/TARGETS
@@ -26,7 +26,7 @@
   , "stage": ["test", "buildtool", "graph_traverser"]
   }
 , "graph_traverser_remote":
-  { "type": ["@", "rules", "CC/test", "test"]
+  { "type": ["test/utils/remote_execution", "CC test"]
   , "name": ["graph_traverser_remote"]
   , "srcs": ["graph_traverser_remote.test.cpp"]
   , "data": ["test_data"]