diff --git a/ci/builders/linux_android_aot_engine.json b/ci/builders/linux_android_aot_engine.json
index 41dfccb36b13e..fd6b8a30152a5 100644
--- a/ci/builders/linux_android_aot_engine.json
+++ b/ci/builders/linux_android_aot_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [
diff --git a/ci/builders/linux_android_debug_engine.json b/ci/builders/linux_android_debug_engine.json
index a9f2c20f70a21..38b24106cc43f 100644
--- a/ci/builders/linux_android_debug_engine.json
+++ b/ci/builders/linux_android_debug_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [
diff --git a/ci/builders/linux_arm_host_engine.json b/ci/builders/linux_arm_host_engine.json
index e5890f95d3bc7..6af3a9f172f4b 100644
--- a/ci/builders/linux_arm_host_engine.json
+++ b/ci/builders/linux_arm_host_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [
diff --git a/ci/builders/linux_fuchsia.json b/ci/builders/linux_fuchsia.json
index 8ed7e08f63287..947226c7f5c56 100644
--- a/ci/builders/linux_fuchsia.json
+++ b/ci/builders/linux_fuchsia.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "drone_dimensions": [
diff --git a/ci/builders/linux_host_desktop_engine.json b/ci/builders/linux_host_desktop_engine.json
index 97e2c3d3580c0..70812cef54855 100644
--- a/ci/builders/linux_host_desktop_engine.json
+++ b/ci/builders/linux_host_desktop_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [
diff --git a/ci/builders/linux_host_engine.json b/ci/builders/linux_host_engine.json
index ea2e11cb213ca..3870ea1b7614b 100644
--- a/ci/builders/linux_host_engine.json
+++ b/ci/builders/linux_host_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on linux hosts should go in one of the other linux_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [
@@ -208,40 +216,6 @@
                     ]
                 }
             ]
-        },
-        {
-            "archives": [
-            ],
-            "cas_archive": false,
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false,
-                "use_rbe": true
-            },
-            "gn": [
-                "--target-dir",
-                "ci/host_debug",
-                "--runtime-mode",
-                "debug",
-                "--no-prebuilt-dart-sdk",
-                "--build-embedder-examples",
-                "--rbe",
-                "--no-goma"
-            ],
-            "name": "ci/host_debug_no_prebuilt_dart_sdk",
-            "description": "Produces debug mode Linux host-side tooling for Linux without use of prebuilt dart sdk artifacts.",
-            "ninja": {
-                "config": "ci/host_debug",
-                "targets": [
-                    "default"
-                ]
-            },
-            "tests": [
-            ]
         }
     ],
     "generators": {
diff --git a/ci/builders/linux_unopt.json b/ci/builders/linux_unopt.json
index fe260c013b49a..0835c0f16e167 100644
--- a/ci/builders/linux_unopt.json
+++ b/ci/builders/linux_unopt.json
@@ -363,6 +363,36 @@
                     ]
                 }
             ]
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "download_jdk": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--target-dir",
+                "ci/host_debug",
+                "--runtime-mode",
+                "debug",
+                "--no-prebuilt-dart-sdk",
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "ci/host_debug_no_prebuilt_dart_sdk",
+            "description": "Produces debug mode Linux host-side tooling for Linux without use of prebuilt dart sdk artifacts.",
+            "ninja": {
+                "config": "ci/host_debug",
+                "targets": [
+                    "default"
+                ]
+            }
         }
     ]
 }
diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json
index a773e1df31ff3..311bdd58a79da 100644
--- a/ci/builders/mac_android_aot_engine.json
+++ b/ci/builders/mac_android_aot_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on mac hosts should go in one of the other mac_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "archives": [
diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index dbec8bb711396..78423c2acc813 100644
--- a/ci/builders/mac_ios_engine.json
+++ b/ci/builders/mac_ios_engine.json
@@ -1,4 +1,12 @@
 {
+    "_comment": [
+        "The builds defined in this file should not contain tests, ",
+        "and the file should not contain builds that are essentially tests. ",
+        "The only builds in this file should be the builds necessary to produce ",
+        "release artifacts. ",
+        "Tests to run on mac hosts should go in one of the other mac_ build ",
+        "definition files."
+    ],
     "builds": [
         {
             "drone_dimensions": [