diff --git a/master/custom/factories.py b/master/custom/factories.py
index 1f5e05e2..c5ce171e 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -948,7 +948,7 @@ class Wasm32WasiCrossBuild(UnixCrossBuild):
     host_configure_cmd = ["../../Tools/wasm/wasi-env", "../../configure"]
 
     # See comment in _Wasm32WasiPreview1Build.__init__
-    branches = {BRANCHES[3, 11], BRANCHES[3, 12]}
+    branches = BRANCHES.only_until(3, 12)
 
     def setup(self, branch, worker, test_with_PTY=False, **kwargs):
         self.addStep(
@@ -993,7 +993,7 @@ def __init__(self, source, *, extra_tags=[], **kwargs):
             # The non-debug WASI buildbot is meant for 3.11 and 3.12 only.
             # Don't use it on PRs; it's tier 3 only and getting it to
             # work on PRs against `main` is too much work.
-            self.branches = {BRANCHES[3, 11], BRANCHES[3, 12]}
+            self.branches = BRANCHES.only_until(3, 12)
         super().__init__(source, extra_tags=extra_tags, **kwargs)
 
     def setup(self, branch, worker, test_with_PTY=False, **kwargs):
diff --git a/master/custom/workers.py b/master/custom/workers.py
index 5ef90294..983262c7 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -371,7 +371,6 @@ def get_workers(settings):
         cpw(
             name="bcannon-wasi",
             tags=['wasm', 'wasi'],
-            branches=BRANCHES.only_since(3, 11),
             parallel_tests=2,
             parallel_builders=2,
             timeout_factor=2,  # Increase the timeout on this slow worker
@@ -419,14 +418,12 @@ def get_workers(settings):
         cpw(
             name="kushaldas-wasi",
             tags=['wasm', 'wasi'],
-            branches=BRANCHES.only_since(3, 11),
             parallel_tests=4,
             parallel_builders=2,
         ),
         cpw(
             name="onder-riscv64",
             tags=['linux', 'unix', 'debian', 'riscv64', 'dtrace'],
-            branches=BRANCHES.only_since(3, 11),
             parallel_tests=4,
         ),
         cpw(