diff --git a/TEST_MAPPING b/TEST_MAPPING
index ba5af969f..0b110f918 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,13 +3,15 @@
     {
       "name": "toybox-tests"
     },
-    {
-      "name": "toybox-gtests"
-    },
     {
       "name": "aidl_integration_test"
     }
   ],
+  "postsubmit": [
+    {
+      "name": "toybox-gtests"
+    }
+  ],
   "hwasan-postsubmit": [
     {
       "name": "toybox-tests"