--- a/process/factory.py
+++ b/process/factory.py
@@ -4785,22 +4785,30 @@ class SigningScriptFactory(ScriptFactory
             self.addStep(SigningServerAuthenication(
                 servers=self.signingServers,
                 server_cert=SIGNING_SERVER_CERT,
                 slavedest=token,
                 workdir='.',
                 name='download_token',
             ))
             # toolsdir, basedir
-            self.addStep(SetProperty(
-                name='set_toolsdir',
-                command=self.get_basedir_cmd,
-                property='toolsdir',
-                workdir='scripts',
-            ))
+            if self.tools_repo_cache:
+                self.addStep(SetProperty(
+                    name='set_toolsdir',
+                    command=['bash', '-c', 'pwd'],
+                    property='toolsdir',
+                    workdir=self.tools_repo_cache
+                ))
+            else:
+                self.addStep(SetProperty(
+                    name='set_toolsdir',
+                    command=self.get_basedir_cmd,
+                    property='toolsdir',
+                    workdir='scripts',
+                ))
             self.addStep(SetProperty(
                 name='set_basedir',
                 command=self.get_basedir_cmd,
                 property='basedir',
                 workdir='.',
             ))
             signing_env = self.env.copy()
             signing_env['MOZ_SIGN_CMD'] = WithProperties(get_signing_cmd(