diff --git a/osbase/bringup/test/BUILD.bazel b/osbase/bringup/test/BUILD.bazel
index 307220c..15409ac 100644
--- a/osbase/bringup/test/BUILD.bazel
+++ b/osbase/bringup/test/BUILD.bazel
@@ -30,7 +30,7 @@
         "xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
     },
     deps = [
-        "//osbase/cmd",
+        "//osbase/test/cmd",
         "@io_bazel_rules_go//go/runfiles",
     ],
 )
diff --git a/osbase/bringup/test/run_test.go b/osbase/bringup/test/run_test.go
index 03ae71b..69b881e 100644
--- a/osbase/bringup/test/run_test.go
+++ b/osbase/bringup/test/run_test.go
@@ -12,7 +12,7 @@
 
 	"github.com/bazelbuild/rules_go/go/runfiles"
 
-	"source.monogon.dev/osbase/cmd"
+	"source.monogon.dev/osbase/test/cmd"
 )
 
 var (
diff --git a/osbase/cmd/BUILD.bazel b/osbase/test/cmd/BUILD.bazel
similarity index 78%
rename from osbase/cmd/BUILD.bazel
rename to osbase/test/cmd/BUILD.bazel
index dd5f66e..6d6a3c9 100644
--- a/osbase/cmd/BUILD.bazel
+++ b/osbase/test/cmd/BUILD.bazel
@@ -3,7 +3,7 @@
 go_library(
     name = "cmd",
     srcs = ["run.go"],
-    importpath = "source.monogon.dev/osbase/cmd",
+    importpath = "source.monogon.dev/osbase/test/cmd",
     visibility = ["//visibility:public"],
     deps = [
         "//osbase/logbuffer",
diff --git a/osbase/cmd/run.go b/osbase/test/cmd/run.go
similarity index 100%
rename from osbase/cmd/run.go
rename to osbase/test/cmd/run.go
diff --git a/osbase/freeport/BUILD.bazel b/osbase/test/freeport/BUILD.bazel
similarity index 72%
rename from osbase/freeport/BUILD.bazel
rename to osbase/test/freeport/BUILD.bazel
index b0fcd25..30d229f 100644
--- a/osbase/freeport/BUILD.bazel
+++ b/osbase/test/freeport/BUILD.bazel
@@ -3,6 +3,6 @@
 go_library(
     name = "freeport",
     srcs = ["freeport.go"],
-    importpath = "source.monogon.dev/osbase/freeport",
+    importpath = "source.monogon.dev/osbase/test/freeport",
     visibility = ["//visibility:public"],
 )
diff --git a/osbase/freeport/freeport.go b/osbase/test/freeport/freeport.go
similarity index 100%
rename from osbase/freeport/freeport.go
rename to osbase/test/freeport/freeport.go
diff --git a/osbase/test/qemu/BUILD.bazel b/osbase/test/qemu/BUILD.bazel
index 0145ddb..dc89881 100644
--- a/osbase/test/qemu/BUILD.bazel
+++ b/osbase/test/qemu/BUILD.bazel
@@ -15,7 +15,7 @@
         "xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
     },
     deps = [
-        "//osbase/freeport",
+        "//osbase/test/freeport",
         "@io_bazel_rules_go//go/runfiles",
         "@org_golang_x_sys//unix",
     ],
diff --git a/osbase/test/qemu/launch.go b/osbase/test/qemu/launch.go
index ba33961..a427f17 100644
--- a/osbase/test/qemu/launch.go
+++ b/osbase/test/qemu/launch.go
@@ -21,7 +21,7 @@
 	"github.com/bazelbuild/rules_go/go/runfiles"
 	"golang.org/x/sys/unix"
 
-	"source.monogon.dev/osbase/freeport"
+	"source.monogon.dev/osbase/test/freeport"
 )
 
 var (
diff --git a/osbase/socksproxy/BUILD.bazel b/osbase/test/socksproxy/BUILD.bazel
similarity index 85%
rename from osbase/socksproxy/BUILD.bazel
rename to osbase/test/socksproxy/BUILD.bazel
index 2365f12..4ba8a71 100644
--- a/osbase/socksproxy/BUILD.bazel
+++ b/osbase/test/socksproxy/BUILD.bazel
@@ -6,7 +6,7 @@
         "protocol.go",
         "socksproxy.go",
     ],
-    importpath = "source.monogon.dev/osbase/socksproxy",
+    importpath = "source.monogon.dev/osbase/test/socksproxy",
     visibility = ["//visibility:public"],
 )
 
diff --git a/osbase/socksproxy/protocol.go b/osbase/test/socksproxy/protocol.go
similarity index 100%
rename from osbase/socksproxy/protocol.go
rename to osbase/test/socksproxy/protocol.go
diff --git a/osbase/socksproxy/socksproxy.go b/osbase/test/socksproxy/socksproxy.go
similarity index 100%
rename from osbase/socksproxy/socksproxy.go
rename to osbase/test/socksproxy/socksproxy.go
diff --git a/osbase/socksproxy/socksproxy_test.go b/osbase/test/socksproxy/socksproxy_test.go
similarity index 100%
rename from osbase/socksproxy/socksproxy_test.go
rename to osbase/test/socksproxy/socksproxy_test.go