diff --git a/keystore2/TEST_MAPPING b/keystore2/TEST_MAPPING
index 6c177b1..57ce78c 100644
--- a/keystore2/TEST_MAPPING
+++ b/keystore2/TEST_MAPPING
@@ -1,12 +1,6 @@
 {
   "presubmit": [
     {
-      "name": "librkpd_client.test"
-    },
-    {
-      "name": "libwatchdog_rs.test"
-    },
-    {
       "name": "keystore2_crypto_test"
     },
     {
@@ -22,9 +16,6 @@
       "name": "keystore2_legacy_blobs_test"
     },
     {
-      "name": "keystore2_client_tests"
-    },
-    {
       "name": "CtsIdentityTestCases"
     },
     {
@@ -39,6 +30,15 @@
   "postsubmit": [
     {
       "name": "CtsKeystorePerformanceTestCases"
+    },
+    {
+      "name": "keystore2_client_tests"
+    },
+    {
+      "name": "librkpd_client.test"
+    },
+    {
+      "name": "libwatchdog_rs.test"
     }
   ]
 }