diff --git a/TEST_MAPPING b/TEST_MAPPING
index b6a6bf3..db0b43a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -64,9 +64,6 @@
     {
       "name": "AvfRkpdAppGoogleIntegrationTests",
       "keywords": ["internal"]
-    },
-    {
-      "name": "ferrochrome-tests"
     }
   ],
   "postsubmit": [
diff --git a/tests/ferrochrome/Android.bp b/tests/ferrochrome/Android.bp
index 58c05a8..889f41e 100644
--- a/tests/ferrochrome/Android.bp
+++ b/tests/ferrochrome/Android.bp
@@ -5,7 +5,6 @@
 sh_test_host {
     name: "ferrochrome-tests",
     src: "ferrochrome.sh",
-    test_suites: ["general-tests"],
     test_options: {
         unit_test: false,
     },