--- a/process/factory.py
+++ b/process/factory.py
@@ -376,21 +376,25 @@ class TooltoolMixin(object):
             WithProperties(
                 '%(toolsdir)s/scripts/tooltool/tooltool_wrapper.sh'),
             self.tooltool_manifest_src,
             self.tooltool_url_list[0],
             self.tooltool_bootstrap,
         ]
         if self.tooltool_script:
             command.extend(self.tooltool_script)
-        self.addStep(ShellCommand(
+        if 'workdir' not in kwargs:
+            kwargs['workdir'] = None
+        self.addStep(MockCommand(
             name='run_tooltool',
             command=command,
             env=self.env,
             haltOnFailure=True,
+            mock=self.use_mock,
+            target=self.mock_target,
             **kwargs
         ))
 
 
 class MozillaBuildFactory(RequestSortingBuildFactory, MockMixin):
     ignore_dirs = ['info', 'rel-*:10d', 'tb-rel-*:10d']
 
     def __init__(self, hgHost, repoPath, buildToolsRepoPath, buildSpace=0,
@@ -1320,17 +1324,17 @@ class MercurialBuildFactory(MozillaBuild
             descriptionDone=['got', 'mozconfig'],
             haltOnFailure=True
         ))
         self.addStep(ShellCommand(
                      name='cat_mozconfig',
                      command=['cat', '.mozconfig'],
                      ))
         if self.tooltool_manifest_src:
-            self.addTooltoolStep()
+            self.addTooltoolStep(mock_workdir='build')
 
     def addDoBuildSteps(self):
         workdir = WithProperties('%(basedir)s/build')
         if self.platform.startswith('win'):
             workdir = "build"
         command = self.makeCmd + ['-f', 'client.mk', 'build',
                                   WithProperties('MOZ_BUILD_DATE=%(buildid:-)s')]
 
@@ -4644,17 +4648,17 @@ class ScriptFactory(RequestSortingBuildF
             ))
         if self.tooltool_manifest_src:
             self.addStep(SetProperty(
                 name='set_toolsdir',
                 command=['bash', '-c', 'pwd'],
                 property='toolsdir',
                 workdir='scripts',
             ))
-            self.addTooltoolStep()
+            self.addTooltoolStep(mock_workdir='build')
         self.runScript()
         self.addCleanupSteps()
         self.reboot()
 
     def addCleanupSteps(self):
         # remove oauth.txt file, we don't wanna to leave keys lying around
         if self.use_credentials_file:
             self.addStep(ShellCommand(