diff --git a/buildbot/master/files/config/factories.py b/buildbot/master/files/config/factories.py
index 5606aed7..d7bbddf5 100644
--- a/buildbot/master/files/config/factories.py
+++ b/buildbot/master/files/config/factories.py
@@ -167,6 +167,7 @@ class StepsYAMLParsingStep(buildstep.ShellMixin, buildstep.BuildStep):
 
     haltOnFailure = True
     flunkOnFailure = True
+    workdir = None
 
     def __init__(self, builder_name, environment, yaml_path, **kwargs):
         kwargs = self.setupShellMixin(kwargs)
@@ -175,6 +176,10 @@ def __init__(self, builder_name, environment, yaml_path, **kwargs):
         self.environment = environment
         self.yaml_path = yaml_path
 
+    def setDefaultWorkdir(self, workdir):
+        buildstep.BuildStep.setDefaultWorkdir(self, workdir)
+        self.workdir = workdir
+
     @defer.inlineCallbacks
     def run(self):
         self.is_windows = re.match('windows.*', self.builder_name) is not None