--- a/process/factory.py
+++ b/process/factory.py
@@ -4639,24 +4639,16 @@ class ScriptFactory(RequestSortingBuildF
 
         if use_credentials_file:
             self.addStep(FileDownload(
                 mastersrc=os.path.join(os.getcwd(), 'BuildSlaves.py'),
                 slavedest='oauth.txt',
                 workdir='.',
                 flunkOnFailure=False,
             ))
-        if self.tooltool_manifest_src:
-            self.addStep(SetProperty(
-                name='set_toolsdir',
-                command=['bash', '-c', 'pwd'],
-                property='toolsdir',
-                workdir='scripts',
-            ))
-            self.addTooltoolStep(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(
@@ -4693,16 +4685,25 @@ class ScriptFactory(RequestSortingBuildF
                     ))
 
             self.addStep(MockInstall(
                 target=self.mock_target,
                 packages=self.mock_packages,
                 timeout=2700,
             ))
 
+        if self.tooltool_manifest_src:
+            self.addStep(SetProperty(
+                name='set_toolsdir',
+                command=['bash', '-c', 'pwd'],
+                property='toolsdir',
+                workdir='scripts',
+            ))
+            self.addTooltoolStep(workdir='build')
+
     def runScript(self, env=None):
         if not env:
             env = self.env
         self.preRunScript()
         self.addStep(MockCommand(
             name="run_script",
             command=self.cmd,
             env=env,