diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8a0711c..e197b25 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -67,14 +67,14 @@
     {
       "name": "AvfRkpdAppGoogleIntegrationTests",
       "keywords": ["internal"]
+    },
+    {
+      "name": "TerminalAppTests"
     }
   ],
   "ferrochrome-postsubmit": [
     {
       "name": "ferrochrome-tests"
-    },
-    {
-      "name": "TerminalAppTests"
     }
   ],
   "postsubmit": [
diff --git a/tests/Terminal/Android.bp b/tests/Terminal/Android.bp
index 2a52068..7ec4e81 100644
--- a/tests/Terminal/Android.bp
+++ b/tests/Terminal/Android.bp
@@ -18,6 +18,6 @@
         "MicrodroidTestHelper",
     ],
     platform_apis: true,
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests"],
     instrumentation_for: "VmTerminalApp",
 }