diff --git a/tools/auto-tester/src/TestRunner.cpp b/tools/auto-tester/src/TestRunner.cpp
index 9c38fee4c4..d74073c164 100644
--- a/tools/auto-tester/src/TestRunner.cpp
+++ b/tools/auto-tester/src/TestRunner.cpp
@@ -84,7 +84,12 @@ void TestRunner::setWorkingFolder() {
         return;
     }
 
+#ifdef Q_OS_WIN
     _installationFolder = _workingFolder + "/High Fidelity";
+#elif defined Q_OS_MAC
+    _installationFolder = _workingFolder + "/High_Fidelity";
+#endif
+
     _logFile.setFileName(_workingFolder + "/log.txt");
 
     autoTester->enableRunTabControls();
@@ -188,7 +193,7 @@ void TestRunner::runInstaller() {
         exit(-1);
     }
     
-    QString installFolder = QString("\"") + _workingFolder + "/High Fidelity\"";
+    QString installFolder = QString("\"") + _workingFolder + "/High_Fidelity\"";
     if (!QDir().exists(installFolder)) {
         QDir().mkdir(installFolder);
     }
@@ -197,10 +202,9 @@ void TestRunner::runInstaller() {
     script.write("#/bin/sh\n\n");
     script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n");
     
-    QStringList urlParts = _buildInformation.url.split('/');
-    QString installerFileName = urlParts[urlParts.length() - 1].split('.')[0];
-    script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/interface.app\" \"" + _workingFolder + "/High Fidelity/\"\n").toStdString().c_str());
-    
+    script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/interface.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
+    script.write((QString("cp -rf \"$VOLUME/") + "/High Fidelity/Sandbox.app\" \""   + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
+
     script.write("hdiutil detach \"$VOLUME\"\n");
     script.write("killall yes\n");
     script.close();