diff --git a/TEST_MAPPING b/TEST_MAPPING
index 41480026a..9aa510bdc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -16,14 +16,14 @@
                     "include-filter": "android.security.cts.SeamendcHostTest"
                 }
             ]
+        }
+    ],
+    "avf-presubmit": [
+        {
+            "name": "ComposHostTestCases"
         },
         {
             "name": "MicrodroidHostTestCases"
         }
-    ],
-    "avf-postsubmit": [
-        {
-            "name": "ComposHostTestCases"
-        }
     ]
 }