diff --git a/tradefed/Android.bp b/tradefed/Android.bp
index f4e8334f0..4e4e6a7ee 100644
--- a/tradefed/Android.bp
+++ b/tradefed/Android.bp
@@ -15,7 +15,7 @@ bootstrap_go_package {
 
 bootstrap_go_package {
     name: "soong-suite-harness",
-    pkgPath: "android/soong/suite_harness",
+    pkgPath: "android/soong/tradefed/suite_harness",
     deps: [
         "blueprint",
         "blueprint-pathtools",
@@ -25,7 +25,7 @@ bootstrap_go_package {
         "soong-java",
     ],
     srcs: [
-        "tradefed_binary.go",
+        "suite_harness/tradefed_binary.go",
     ],
     pluginFor: ["soong_build"],
 }
diff --git a/tradefed/tradefed_binary.go b/tradefed/suite_harness/tradefed_binary.go
similarity index 98%
rename from tradefed/tradefed_binary.go
rename to tradefed/suite_harness/tradefed_binary.go
index 7960fdc88..1bd4f93dc 100644
--- a/tradefed/tradefed_binary.go
+++ b/tradefed/suite_harness/tradefed_binary.go
@@ -23,7 +23,7 @@ import (
 	"android/soong/java"
 )
 
-var pctx = android.NewPackageContext("android/soong/suite_harness")
+var pctx = android.NewPackageContext("android/soong/tradefed/suite_harness")
 
 func init() {
 	android.RegisterModuleType("tradefed_binary_host", tradefedBinaryFactory)