diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg
index 8f4536aa..f21b6f29 100644
--- a/buildbot/master/files/config/master.cfg
+++ b/buildbot/master/files/config/master.cfg
@@ -1,4 +1,5 @@
 from buildbot.plugins import buildslave, changes, schedulers, status, util
+from buildbot.schedulers.forcesched import BuildslaveChoiceParameter
 from buildbot.status import html, status_push, web, words
 
 import environments as envs
@@ -104,6 +105,9 @@ c['schedulers'].append(schedulers.ForceScheduler(
         "windows-msvc-dev",
         "windows-msvc-nightly",
     ],
+    properties=[
+        BuildslaveChoiceParameter(),
+    ]
 ))
 c['schedulers'].append(schedulers.Nightly(
     name="Nightly",
@@ -147,6 +151,7 @@ class DynamicServoBuilder(util.BuilderConfig):
             slavenames=slavenames,
             factory=factories.DynamicServoFactory(name, environment),
             nextBuild=branch_priority,
+            canStartBuild=util.enforceChosenSlave,
         )
 
 
@@ -176,6 +181,7 @@ c['builders'] = [
         name="doc",
         slavenames=LINUX_SLAVES,
         factory=factories.doc,
+        canStartBuild=util.enforceChosenSlave,
     ),
 ]