diff --git a/fastboot/Android.bp b/fastboot/Android.bp
index a801900f1..47830ef67 100644
--- a/fastboot/Android.bp
+++ b/fastboot/Android.bp
@@ -390,6 +390,8 @@ cc_test_host {
             enabled: false,
         },
     },
+
+    test_suites: ["general-tests"],
 }
 
 cc_test_host {
diff --git a/fastboot/TEST_MAPPING b/fastboot/TEST_MAPPING
new file mode 100644
index 000000000..10f3d82b0
--- /dev/null
+++ b/fastboot/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "fastboot_test"
+    }
+  ]
+}