diff --git a/metropolis/cli/metroctl/test/BUILD.bazel b/metropolis/cli/metroctl/test/BUILD.bazel
index edaa112..3632a44 100644
--- a/metropolis/cli/metroctl/test/BUILD.bazel
+++ b/metropolis/cli/metroctl/test/BUILD.bazel
@@ -14,7 +14,7 @@
     deps = [
         "//metropolis/test/launch",
         "//metropolis/test/util",
-        "//osbase/cmd",
+        "//osbase/test/cmd",
         "@io_bazel_rules_go//go/runfiles",
     ],
 )
diff --git a/metropolis/cli/metroctl/test/main_test.go b/metropolis/cli/metroctl/test/main_test.go
index b853b82..f44f508 100644
--- a/metropolis/cli/metroctl/test/main_test.go
+++ b/metropolis/cli/metroctl/test/main_test.go
@@ -18,7 +18,7 @@
 
 	mlaunch "source.monogon.dev/metropolis/test/launch"
 	"source.monogon.dev/metropolis/test/util"
-	"source.monogon.dev/osbase/cmd"
+	"source.monogon.dev/osbase/test/cmd"
 )
 
 var (
diff --git a/metropolis/cli/takeover/e2e/BUILD.bazel b/metropolis/cli/takeover/e2e/BUILD.bazel
index d01812e..6cebd51 100644
--- a/metropolis/cli/takeover/e2e/BUILD.bazel
+++ b/metropolis/cli/takeover/e2e/BUILD.bazel
@@ -23,8 +23,8 @@
     },
     deps = [
         "//osbase/fat32",
-        "//osbase/freeport",
         "//osbase/structfs",
+        "//osbase/test/freeport",
         "@io_bazel_rules_go//go/runfiles",
         "@org_golang_x_crypto//ssh",
         "@org_golang_x_crypto//ssh/agent",
diff --git a/metropolis/cli/takeover/e2e/main_test.go b/metropolis/cli/takeover/e2e/main_test.go
index 556f300..c86a48d 100644
--- a/metropolis/cli/takeover/e2e/main_test.go
+++ b/metropolis/cli/takeover/e2e/main_test.go
@@ -25,8 +25,8 @@
 	"golang.org/x/sys/unix"
 
 	"source.monogon.dev/osbase/fat32"
-	"source.monogon.dev/osbase/freeport"
 	"source.monogon.dev/osbase/structfs"
+	"source.monogon.dev/osbase/test/freeport"
 )
 
 var (