diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 924860b..f7693cf 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1859,16 +1859,6 @@
           "arguments": ["create_sdk"]
         },
         {
-          "name": "analyze pkg/analyzer_cli --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/analyzer_cli"
-          ]
-        },
-        {
           "name": "analyze pkg/analysis_server --use-cfe",
           "script": "out/ReleaseX64/dart-sdk/bin/dart",
           "arguments": [
@@ -1889,6 +1879,45 @@
           ]
         },
         {
+          "name": "analyze pkg/analyzer_cli --use-cfe",
+          "script": "out/ReleaseX64/dart-sdk/bin/dart",
+          "arguments": [
+            "pkg/analyzer_cli/bin/analyzer.dart",
+            "--fatal-warnings",
+            "--use-cfe",
+            "pkg/analyzer_cli"
+          ]
+        },
+        {
+          "name": "analyze pkg/front_end --use-cfe",
+          "script": "out/ReleaseX64/dart-sdk/bin/dart",
+          "arguments": [
+            "pkg/analyzer_cli/bin/analyzer.dart",
+            "--fatal-warnings",
+            "--use-cfe",
+            "pkg/front_end"
+          ]
+        },
+        {
+          "name": "analyze pkg/kernel --use-cfe",
+          "script": "out/ReleaseX64/dart-sdk/bin/dart",
+          "arguments": [
+            "pkg/analyzer_cli/bin/analyzer.dart",
+            "--fatal-warnings",
+            "--use-cfe",
+            "pkg/kernel"
+          ]
+        },
+        {
+          "name": "dartanalyzer --batch --use-cfe pkg tests",
+          "arguments": [
+            "--compiler=dart2analyzer",
+            "--use-cfe",
+            "--use-sdk",
+            "pkg"
+          ]
+        },
+        {
           "name": "benchmarks analysis-server-cold --use-cfe",
           "script": "out/ReleaseX64/dart-sdk/bin/dart",
           "arguments": [
@@ -1915,16 +1944,6 @@
           "arguments": ["create_sdk"]
         },
         {
-          "name": "analyze pkg/analyzer_cli --use-cfe",
-          "script": "out/ReleaseX64/dart-sdk/bin/dart",
-          "arguments": [
-            "pkg/analyzer_cli/bin/analyzer.dart",
-            "--fatal-warnings",
-            "--use-cfe",
-            "pkg/analyzer_cli"
-          ]
-        },
-        {
           "name": "analyze pkg/analysis_server --use-cfe",
           "script": "out/ReleaseX64/dart-sdk/bin/dart",
           "arguments": [
@@ -1943,6 +1962,36 @@
             "--use-cfe",
             "pkg/analyzer"
           ]
+        },
+        {
+          "name": "analyze pkg/analyzer_cli --use-cfe",
+          "script": "out/ReleaseX64/dart-sdk/bin/dart",
+          "arguments": [
+            "pkg/analyzer_cli/bin/analyzer.dart",
+            "--fatal-warnings",
+            "--use-cfe",
+            "pkg/analyzer_cli"
+          ]
+        },
+        {
+          "name": "analyze pkg/front_end --use-cfe",
+          "script": "out/ReleaseX64/dart-sdk/bin/dart",
+          "arguments": [
+            "pkg/analyzer_cli/bin/analyzer.dart",
+            "--fatal-warnings",
+            "--use-cfe",
+            "pkg/front_end"
+          ]
+        },
+        {
+          "name": "analyze pkg/kernel --use-cfe",
+          "script": "out/ReleaseX64/dart-sdk/bin/dart",
+          "arguments": [
+            "pkg/analyzer_cli/bin/analyzer.dart",
+            "--fatal-warnings",
+            "--use-cfe",
+            "pkg/kernel"
+          ]
         }
       ]
     },