diff --git a/metropolis/BUILD.bazel b/metropolis/BUILD.bazel
index 5c2816a..4d9bfe6 100644
--- a/metropolis/BUILD.bazel
+++ b/metropolis/BUILD.bazel
@@ -1,17 +1,11 @@
-test_suite(
+alias(
     name = "launch",
-    tags = ["manual"],
-    tests = [
-        "//metropolis/test/launch/cli/launch",
-    ],
+    actual = "//metropolis/test/launch/cli/launch",
 )
 
-test_suite(
+alias(
     name = "launch-cluster",
-    tags = ["manual"],
-    tests = [
-        "//metropolis/test/launch/cli/launch-cluster",
-    ],
+    actual = "//metropolis/test/launch/cli/launch-cluster",
 )
 
 alias(
diff --git a/metropolis/test/launch/cli/launch-cluster/BUILD.bazel b/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
index 2c673c5..688228e 100644
--- a/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
@@ -13,20 +13,10 @@
 )
 
 go_binary(
-    name = "launch-cluster_bin",
+    name = "launch-cluster",
     data = [
         "//metropolis/cli/metroctl",
     ],
     embed = [":launch-cluster_lib"],
-    visibility = ["//:__pkg__"],
-)
-
-# Wrap the binary in a native_test so that we can run it with the
-# `bazel test` command inside the sandbox.
-native_test(
-    name = "launch-cluster",
-    src = ":launch-cluster_bin",
-    out = "launch",
-    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
diff --git a/metropolis/test/launch/cli/launch/BUILD.bazel b/metropolis/test/launch/cli/launch/BUILD.bazel
index cfbf93a..74c63d2 100644
--- a/metropolis/test/launch/cli/launch/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch/BUILD.bazel
@@ -14,22 +14,12 @@
 )
 
 go_binary(
-    name = "launch_bin",
+    name = "launch",
     data = [
         "//metropolis/node:image",
         "//metropolis/node:swtpm_data",
         "//third_party/edk2:firmware",
     ],
     embed = [":launch_lib"],
-    visibility = ["//:__pkg__"],
-)
-
-# Wrap the binary in a native_test so that we can run it with the
-# `bazel test` command inside the sandbox.
-native_test(
-    name = "launch",
-    src = ":launch_bin",
-    out = "launch",
-    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
diff --git a/metropolis/test/launch/cluster/cluster.go b/metropolis/test/launch/cluster/cluster.go
index 5469443..e7a49a2 100644
--- a/metropolis/test/launch/cluster/cluster.go
+++ b/metropolis/test/launch/cluster/cluster.go
@@ -165,17 +165,8 @@
 	if err := os.Mkdir(tpmt, 0o755); err != nil {
 		return nil, fmt.Errorf("while creating the TPM directory: %w", err)
 	}
-	tpms, err := runfiles.Rlocation("_main/metropolis/node/tpm")
-	if err != nil {
-		return nil, fmt.Errorf("while resolving a path: %w", err)
-	}
-	tpmf, err := os.ReadDir(tpms)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read TPM directory: %w", err)
-	}
-	for _, file := range tpmf {
-		name := file.Name()
-		src, err := runfiles.Rlocation(filepath.Join(tpms, name))
+	for _, name := range []string{"issuercert.pem", "signkey.pem", "tpm2-00.permall"} {
+		src, err := runfiles.Rlocation(filepath.Join("_main/metropolis/node/tpm", name))
 		if err != nil {
 			return nil, fmt.Errorf("while resolving a path: %w", err)
 		}