diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp
index 0f38a9c619..1cfc32e481 100644
--- a/tools/auto-tester/src/Test.cpp
+++ b/tools/auto-tester/src/Test.cpp
@@ -411,13 +411,15 @@ void Test::createRecursiveScript(const QString& topLevelDirectory, bool interact
     textStream << "// This is an automatically generated file, created by auto-tester on " << QDateTime::currentDateTime().toString(DATE_TIME_FORMAT) << endl << endl;
 
     textStream << "user = \"" + GIT_HUB_USER + "/\";" << endl;
-    textStream << "repository = \"" + GIT_HUB_REPOSITORY + "/\";" << endl;
+    textStream << "repository = \"" + GIT_HUB_REPOSITORY + "/\";" << endl << endl;
 
-    QString branch = autoTester->getSelectedBranch();
-    textStream << "branch = \"" + branch + "/\";" << endl << endl;
+    textStream << "Script.include(\"https://github.com/highfidelity/hifi_tests/blob/RC69/tests/utils/branchUtils.js?raw=true\");" << endl;
+    textStream << "branch = getBranch(Script.resolvePath(\".\"), repository) +\"/\";" << endl << endl;
 
     // Wait 10 seconds before starting
-    textStream << "Test.wait(10000);" << endl << endl;
+    textStream << "if (typeof Test !== 'undefined') {" << endl;
+    textStream << "    Test.wait(10000);" << endl;
+    textStream << "};" << endl << endl;
 
     textStream << "var repositoryPath = \"https://github.com/\" + user + repository + \"blob/\" + branch;" << endl;
     textStream << "var autoTester = Script.require(repositoryPath + \"tests/utils/autoTester.js?raw=true\");" << endl << endl;
diff --git a/tools/auto-tester/src/ui/AutoTester.ui b/tools/auto-tester/src/ui/AutoTester.ui
index 44c00509e6..df21dad1eb 100644
--- a/tools/auto-tester/src/ui/AutoTester.ui
+++ b/tools/auto-tester/src/ui/AutoTester.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>607</width>
+    <width>583</width>
     <height>514</height>
    </rect>
   </property>
@@ -17,9 +17,9 @@
    <widget class="QPushButton" name="closeButton">
     <property name="geometry">
      <rect>
-      <x>360</x>
-      <y>400</y>
-      <width>220</width>
+      <x>460</x>
+      <y>410</y>
+      <width>101</width>
       <height>40</height>
      </rect>
     </property>
@@ -43,7 +43,7 @@
    <widget class="QPushButton" name="evaluateTestsButton">
     <property name="geometry">
      <rect>
-      <x>340</x>
+      <x>330</x>
       <y>275</y>
       <width>220</width>
       <height>40</height>
@@ -56,8 +56,8 @@
    <widget class="QPushButton" name="createRecursiveScriptButton">
     <property name="geometry">
      <rect>
-      <x>340</x>
-      <y>95</y>
+      <x>330</x>
+      <y>30</y>
       <width>220</width>
       <height>40</height>
      </rect>
@@ -69,8 +69,8 @@
    <widget class="QCheckBox" name="checkBoxInteractiveMode">
     <property name="geometry">
      <rect>
-      <x>343</x>
-      <y>240</y>
+      <x>330</x>
+      <y>250</y>
       <width>131</width>
       <height>20</height>
      </rect>
@@ -85,7 +85,7 @@
    <widget class="QProgressBar" name="progressBar">
     <property name="geometry">
      <rect>
-      <x>340</x>
+      <x>330</x>
       <y>330</y>
       <width>255</width>
       <height>23</height>
@@ -98,8 +98,8 @@
    <widget class="QPushButton" name="createAllRecursiveScriptsButton">
     <property name="geometry">
      <rect>
-      <x>340</x>
-      <y>160</y>
+      <x>330</x>
+      <y>80</y>
       <width>220</width>
       <height>40</height>
      </rect>
@@ -112,7 +112,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>80</y>
+      <y>100</y>
       <width>220</width>
       <height>40</height>
      </rect>
@@ -125,7 +125,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>130</y>
+      <y>150</y>
       <width>220</width>
       <height>40</height>
      </rect>
@@ -138,7 +138,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>180</y>
+      <y>220</y>
       <width>220</width>
       <height>40</height>
      </rect>
@@ -176,8 +176,8 @@
    <widget class="QComboBox" name="branchComboBox">
     <property name="geometry">
      <rect>
-      <x>428</x>
-      <y>41</y>
+      <x>418</x>
+      <y>211</y>
       <width>131</width>
       <height>31</height>
      </rect>
@@ -186,10 +186,10 @@
    <widget class="QLabel" name="label">
     <property name="geometry">
      <rect>
-      <x>340</x>
-      <y>30</y>
+      <x>330</x>
+      <y>220</y>
       <width>81</width>
-      <height>51</height>
+      <height>16</height>
      </rect>
     </property>
     <property name="font">
@@ -207,7 +207,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>607</width>
+     <width>583</width>
      <height>21</height>
     </rect>
    </property>