diff --git a/TEST_MAPPING b/TEST_MAPPING
index df90769..038aaf9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -494,6 +494,15 @@
       "name": "art-run-test-2265-checker-select-binary-unary[com.google.android.art.apex]"
     },
     {
+      "name": "art-run-test-2266-checker-remove-empty-ifs[com.google.android.art.apex]"
+    },
+    {
+      "name": "art-run-test-2268-checker-remove-dead-phis[com.google.android.art.apex]"
+    },
+    {
+      "name": "art-run-test-2269-checker-constant-folding-instrinsics[com.google.android.art.apex]"
+    },
+    {
       "name": "art-run-test-300-package-override[com.google.android.art.apex]"
     },
     {
@@ -1328,6 +1337,12 @@
       "name": "art-run-test-843-default-interface[com.google.android.art.apex]"
     },
     {
+      "name": "art-run-test-851-null-instanceof[com.google.android.art.apex]"
+    },
+    {
+      "name": "art-run-test-853-checker-inlining[com.google.android.art.apex]"
+    },
+    {
       "name": "art-run-test-963-default-range-smali[com.google.android.art.apex]"
     },
     {
@@ -1922,6 +1937,15 @@
       "name": "art-run-test-2265-checker-select-binary-unary"
     },
     {
+      "name": "art-run-test-2266-checker-remove-empty-ifs"
+    },
+    {
+      "name": "art-run-test-2268-checker-remove-dead-phis"
+    },
+    {
+      "name": "art-run-test-2269-checker-constant-folding-instrinsics"
+    },
+    {
       "name": "art-run-test-300-package-override"
     },
     {
@@ -2756,6 +2780,12 @@
       "name": "art-run-test-843-default-interface"
     },
     {
+      "name": "art-run-test-851-null-instanceof"
+    },
+    {
+      "name": "art-run-test-853-checker-inlining"
+    },
+    {
       "name": "art-run-test-963-default-range-smali"
     },
     {
@@ -3337,6 +3367,15 @@
       "name": "art-run-test-2265-checker-select-binary-unary"
     },
     {
+      "name": "art-run-test-2266-checker-remove-empty-ifs"
+    },
+    {
+      "name": "art-run-test-2268-checker-remove-dead-phis"
+    },
+    {
+      "name": "art-run-test-2269-checker-constant-folding-instrinsics"
+    },
+    {
       "name": "art-run-test-300-package-override"
     },
     {
@@ -4171,6 +4210,12 @@
       "name": "art-run-test-843-default-interface"
     },
     {
+      "name": "art-run-test-851-null-instanceof"
+    },
+    {
+      "name": "art-run-test-853-checker-inlining"
+    },
+    {
       "name": "art-run-test-963-default-range-smali"
     },
     {
@@ -4256,24 +4301,9 @@
       "name": "art-run-test-2247-checker-write-barrier-elimination"
     },
     {
-      "name": "art-run-test-2266-checker-remove-empty-ifs"
-    },
-    {
-      "name": "art-run-test-2268-checker-remove-dead-phis"
-    },
-    {
-      "name": "art-run-test-2269-checker-constant-folding-instrinsics"
-    },
-    {
       "name": "art-run-test-2273-checker-unreachable-intrinsics"
     },
     {
-      "name": "art-run-test-851-null-instanceof"
-    },
-    {
-      "name": "art-run-test-853-checker-inlining"
-    },
-    {
       "name": "art_standalone_dexopt_chroot_setup_tests"
     }
   ]
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index fa9bd7d..974137d 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -223,11 +223,6 @@
 # removing them from this set (in order to promote them to
 # presubmits).
 postsubmit_only_tests = frozenset([
-  "851-null-instanceof",
-  "853-checker-inlining",
-  "2266-checker-remove-empty-ifs",
-  "2268-checker-remove-dead-phis",
-  "2269-checker-constant-folding-instrinsics",
   "2247-checker-write-barrier-elimination",
   "2273-checker-unreachable-intrinsics",
 ])