3 files changed, 19 insertions, 13 deletions
diff --git a/test/packetdrill/BUILD b/test/packetdrill/BUILD
index 49642f282..5d95516ee 100644
--- a/test/packetdrill/BUILD
+++ b/test/packetdrill/BUILD
@@ -38,6 +38,15 @@ packetdrill_test(
     scripts = ["tcp_defer_accept_timeout.pkt"],
 )
 
+test_suite(
+    name = "all_tests",
+    tags = [
+        "manual",
+        "packetdrill",
+    ],
+    tests = existing_rules(),
+)
+
 bzl_library(
     name = "defs_bzl",
     srcs = ["defs.bzl"],
diff --git a/test/packetimpact/tests/BUILD b/test/packetimpact/tests/BUILD
index 373ab8d2f..b1b3c578b 100644
--- a/test/packetimpact/tests/BUILD
+++ b/test/packetimpact/tests/BUILD
@@ -383,3 +383,12 @@ validate_all_tests()
     expect_netstack_failure = hasattr(t, "expect_netstack_failure"),
     num_duts = t.num_duts if hasattr(t, "num_duts") else 1,
 ) for t in ALL_TESTS]
+
+test_suite(
+    name = "all_tests",
+    tags = [
+        "manual",
+        "packetimpact",
+    ],
+    tests = existing_rules(),
+)
diff --git a/test/root/BUILD b/test/root/BUILD
index a9130b34f..8d9fff578 100644
--- a/test/root/BUILD
+++ b/test/root/BUILD
@@ -1,5 +1,4 @@
 load("//tools:defs.bzl", "go_library", "go_test")
-load("//tools/vm:defs.bzl", "vm_test")
 
 package(licenses = ["notice"])
 
@@ -24,12 +23,8 @@ go_test(
     ],
     library = ":root",
     tags = [
-        # Requires docker and runsc to be configured before the test runs.
-        # Also, the test needs to be run as root. Note that below, the
-        # root_vm_test relies on the default runtime 'runsc' being installed by
-        # the default installer.
-        "manual",
         "local",
+        "manual",
     ],
     visibility = ["//:sandbox"],
     deps = [
@@ -46,10 +41,3 @@ go_test(
         "@org_golang_x_sys//unix:go_default_library",
     ],
 )
-
-vm_test(
-    name = "root_vm_test",
-    size = "large",
-    shard_count = 1,
-    targets = [":root_test"],
-)