diff --git a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-build-host-clang.textproto
similarity index 94%
copy from generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-host-clang.textproto
copy to generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-build-host-clang.textproto
index a465530..5f1fc6d 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-build-host-clang.textproto
@@ -18,11 +18,11 @@
 }
 swarming {
   builders {
-    name: "pigweed-windows-bazel-host-clang"
+    name: "pigweed-linux-bazel-build-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cores:16"
     dimensions: "cpu:x64|x86-64"
-    dimensions: "os:Windows-10"
+    dimensions: "os:Debian"
     dimensions: "pool:luci.pigweed.ci"
     exe {
       cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
@@ -43,7 +43,7 @@
       '  },'
       '  "$pigweed/pw_presubmit": {'
       '    "step": ['
-      '      "bazel_test"'
+      '      "bazel_build"'
       '    ]'
       '  },'
       '  "dry_run": true,'
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-test-host-clang.textproto
similarity index 97%
rename from generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-host-clang.textproto
rename to generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-test-host-clang.textproto
index 85ad377..5a69aab 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-linux-bazel-test-host-clang.textproto
@@ -18,7 +18,7 @@
 }
 swarming {
   builders {
-    name: "pigweed-linux-bazel-host-clang"
+    name: "pigweed-linux-bazel-test-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cores:16"
     dimensions: "cpu:x64|x86-64"
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-mac-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-mac-bazel-test-host-clang.textproto
similarity index 97%
rename from generated/pigweed/for_review_only/buildbucket/ci/pigweed-mac-bazel-host-clang.textproto
rename to generated/pigweed/for_review_only/buildbucket/ci/pigweed-mac-bazel-test-host-clang.textproto
index a29bd8d..0783249 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-mac-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-mac-bazel-test-host-clang.textproto
@@ -18,7 +18,7 @@
 }
 swarming {
   builders {
-    name: "pigweed-mac-bazel-host-clang"
+    name: "pigweed-mac-bazel-test-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cpu:x64|x86-64"
     dimensions: "os:Mac"
diff --git a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-test-host-clang.textproto
similarity index 97%
rename from generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-host-clang.textproto
rename to generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-test-host-clang.textproto
index a465530..3877c63 100644
--- a/generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/ci/pigweed-windows-bazel-test-host-clang.textproto
@@ -18,7 +18,7 @@
 }
 swarming {
   builders {
-    name: "pigweed-windows-bazel-host-clang"
+    name: "pigweed-windows-bazel-test-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cores:16"
     dimensions: "cpu:x64|x86-64"
diff --git a/generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-build-host-clang.textproto
similarity index 94%
copy from generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-host-clang.textproto
copy to generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-build-host-clang.textproto
index be02d70..0db5d16 100644
--- a/generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-build-host-clang.textproto
@@ -18,11 +18,11 @@
 }
 swarming {
   builders {
-    name: "pigweed-windows-bazel-host-clang"
+    name: "pigweed-linux-bazel-build-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cores:16"
     dimensions: "cpu:x64|x86-64"
-    dimensions: "os:Windows-10"
+    dimensions: "os:Debian"
     dimensions: "pool:luci.pigweed.try"
     exe {
       cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
@@ -43,7 +43,7 @@
       '  },'
       '  "$pigweed/pw_presubmit": {'
       '    "step": ['
-      '      "bazel_test"'
+      '      "bazel_build"'
       '    ]'
       '  },'
       '  "dry_run": true,'
diff --git a/generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-test-host-clang.textproto
similarity index 97%
rename from generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-host-clang.textproto
rename to generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-test-host-clang.textproto
index 0d7ec7d..ca6787e 100644
--- a/generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/try/pigweed-linux-bazel-test-host-clang.textproto
@@ -18,7 +18,7 @@
 }
 swarming {
   builders {
-    name: "pigweed-linux-bazel-host-clang"
+    name: "pigweed-linux-bazel-test-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cores:16"
     dimensions: "cpu:x64|x86-64"
diff --git a/generated/pigweed/for_review_only/buildbucket/try/pigweed-mac-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/try/pigweed-mac-bazel-test-host-clang.textproto
similarity index 97%
rename from generated/pigweed/for_review_only/buildbucket/try/pigweed-mac-bazel-host-clang.textproto
rename to generated/pigweed/for_review_only/buildbucket/try/pigweed-mac-bazel-test-host-clang.textproto
index 91ecf72..a84fd4f 100644
--- a/generated/pigweed/for_review_only/buildbucket/try/pigweed-mac-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/try/pigweed-mac-bazel-test-host-clang.textproto
@@ -18,7 +18,7 @@
 }
 swarming {
   builders {
-    name: "pigweed-mac-bazel-host-clang"
+    name: "pigweed-mac-bazel-test-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cpu:x64|x86-64"
     dimensions: "os:Mac"
diff --git a/generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-host-clang.textproto b/generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-test-host-clang.textproto
similarity index 97%
rename from generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-host-clang.textproto
rename to generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-test-host-clang.textproto
index be02d70..aa66750 100644
--- a/generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-host-clang.textproto
+++ b/generated/pigweed/for_review_only/buildbucket/try/pigweed-windows-bazel-test-host-clang.textproto
@@ -18,7 +18,7 @@
 }
 swarming {
   builders {
-    name: "pigweed-windows-bazel-host-clang"
+    name: "pigweed-windows-bazel-test-host-clang"
     swarming_host: "chromium-swarm.appspot.com"
     dimensions: "cores:16"
     dimensions: "cpu:x64|x86-64"
diff --git a/generated/pigweed/luci/cr-buildbucket.cfg b/generated/pigweed/luci/cr-buildbucket.cfg
index 6a93551..59ab937 100644
--- a/generated/pigweed/luci/cr-buildbucket.cfg
+++ b/generated/pigweed/luci/cr-buildbucket.cfg
@@ -715,7 +715,66 @@
       }
     }
     builders {
-      name: "pigweed-linux-bazel-host-clang"
+      name: "pigweed-linux-bazel-build-host-clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:16"
+      dimensions: "cpu:x64|x86-64"
+      dimensions: "os:Debian"
+      dimensions: "pool:luci.pigweed.ci"
+      exe {
+        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$pigweed/checkout": {'
+        '    "branch": "main",'
+        '    "equivalent_remotes": [],'
+        '    "match_branch": true,'
+        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
+        '    "use_repo": false'
+        '  },'
+        '  "$pigweed/environment": {'
+        '    "config_file": "pw_env_setup/config.json"'
+        '  },'
+        '  "$pigweed/pw_presubmit": {'
+        '    "step": ['
+        '      "bazel_build"'
+        '    ]'
+        '  },'
+        '  "dry_run": true,'
+        '  "recipe": "pw_presubmit"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 2700
+      caches {
+        name: "bazel"
+        path: "bazel"
+        wait_for_warm_cache_secs: 60
+      }
+      caches {
+        name: "builder"
+        path: "builder"
+      }
+      caches {
+        name: "pip"
+        path: "pip"
+        wait_for_warm_cache_secs: 60
+      }
+      service_account: "pigweed-ci-builder@pigweed.google.com.iam.gserviceaccount.com"
+      experimental: YES
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pigweed-linux-bazel-test-host-clang"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:16"
       dimensions: "cpu:x64|x86-64"
@@ -1552,7 +1611,7 @@
       }
     }
     builders {
-      name: "pigweed-mac-bazel-host-clang"
+      name: "pigweed-mac-bazel-test-host-clang"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x64|x86-64"
       dimensions: "os:Mac"
@@ -2187,7 +2246,7 @@
       }
     }
     builders {
-      name: "pigweed-windows-bazel-host-clang"
+      name: "pigweed-windows-bazel-test-host-clang"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:16"
       dimensions: "cpu:x64|x86-64"
@@ -4772,7 +4831,66 @@
       }
     }
     builders {
-      name: "pigweed-linux-bazel-host-clang"
+      name: "pigweed-linux-bazel-build-host-clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:16"
+      dimensions: "cpu:x64|x86-64"
+      dimensions: "os:Debian"
+      dimensions: "pool:luci.pigweed.try"
+      exe {
+        cipd_package: "pigweed/infra/recipe_bundles/pigweed.googlesource.com/infra/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$pigweed/checkout": {'
+        '    "branch": "main",'
+        '    "equivalent_remotes": [],'
+        '    "match_branch": true,'
+        '    "remote": "https://pigweed.googlesource.com/pigweed/pigweed",'
+        '    "use_repo": false'
+        '  },'
+        '  "$pigweed/environment": {'
+        '    "config_file": "pw_env_setup/config.json"'
+        '  },'
+        '  "$pigweed/pw_presubmit": {'
+        '    "step": ['
+        '      "bazel_build"'
+        '    ]'
+        '  },'
+        '  "dry_run": true,'
+        '  "recipe": "pw_presubmit"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 2700
+      caches {
+        name: "bazel"
+        path: "bazel"
+        wait_for_warm_cache_secs: 60
+      }
+      caches {
+        name: "builder"
+        path: "builder"
+      }
+      caches {
+        name: "pip"
+        path: "pip"
+        wait_for_warm_cache_secs: 60
+      }
+      service_account: "pigweed-try-builder@pigweed.google.com.iam.gserviceaccount.com"
+      experimental: YES
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pigweed-linux-bazel-test-host-clang"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:16"
       dimensions: "cpu:x64|x86-64"
@@ -5666,7 +5784,7 @@
       }
     }
     builders {
-      name: "pigweed-mac-bazel-host-clang"
+      name: "pigweed-mac-bazel-test-host-clang"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x64|x86-64"
       dimensions: "os:Mac"
@@ -6413,7 +6531,7 @@
       }
     }
     builders {
-      name: "pigweed-windows-bazel-host-clang"
+      name: "pigweed-windows-bazel-test-host-clang"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cores:16"
       dimensions: "cpu:x64|x86-64"
diff --git a/generated/pigweed/luci/luci-notify.cfg b/generated/pigweed/luci/luci-notify.cfg
index 36b5efd..4ece42c 100644
--- a/generated/pigweed/luci/luci-notify.cfg
+++ b/generated/pigweed/luci/luci-notify.cfg
@@ -249,7 +249,7 @@
   }
   builders {
     bucket: "ci"
-    name: "pigweed-linux-bazel-host-clang"
+    name: "pigweed-linux-bazel-test-host-clang"
     repository: "https://pigweed.googlesource.com/pigweed/pigweed"
   }
 }
@@ -1596,7 +1596,7 @@
   }
   builders {
     bucket: "try"
-    name: "pigweed-linux-bazel-host-clang"
+    name: "pigweed-linux-bazel-test-host-clang"
   }
 }
 notifiers {
diff --git a/generated/pigweed/luci/luci-scheduler.cfg b/generated/pigweed/luci/luci-scheduler.cfg
index fbc0095..7329519 100644
--- a/generated/pigweed/luci/luci-scheduler.cfg
+++ b/generated/pigweed/luci/luci-scheduler.cfg
@@ -365,13 +365,23 @@
   }
 }
 job {
-  id: "pigweed-linux-bazel-host-clang"
+  id: "pigweed-linux-bazel-build-host-clang"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.pigweed.ci"
-    builder: "pigweed-linux-bazel-host-clang"
+    builder: "pigweed-linux-bazel-build-host-clang"
+  }
+}
+job {
+  id: "pigweed-linux-bazel-test-host-clang"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.pigweed.ci"
+    builder: "pigweed-linux-bazel-test-host-clang"
   }
 }
 job {
@@ -525,14 +535,14 @@
   }
 }
 job {
-  id: "pigweed-mac-bazel-host-clang"
+  id: "pigweed-mac-bazel-test-host-clang"
   realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.pigweed.ci"
-    builder: "pigweed-mac-bazel-host-clang"
+    builder: "pigweed-mac-bazel-test-host-clang"
   }
 }
 job {
@@ -667,14 +677,14 @@
   }
 }
 job {
-  id: "pigweed-windows-bazel-host-clang"
+  id: "pigweed-windows-bazel-test-host-clang"
   realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.pigweed.ci"
-    builder: "pigweed-windows-bazel-host-clang"
+    builder: "pigweed-windows-bazel-test-host-clang"
   }
 }
 job {
@@ -874,7 +884,8 @@
   triggers: "host-tools-builder-mac"
   triggers: "host-tools-builder-windows"
   triggers: "pigweed-lintformat"
-  triggers: "pigweed-linux-bazel-host-clang"
+  triggers: "pigweed-linux-bazel-build-host-clang"
+  triggers: "pigweed-linux-bazel-test-host-clang"
   triggers: "pigweed-linux-cmake-host-clang"
   triggers: "pigweed-linux-compatibility-host-disco"
   triggers: "pigweed-linux-gn-crypto-boringssl"