diff --git a/scripts/run-visual-tests.js b/scripts/run-visual-tests.js
index fbfc0988b21..4e4cbc3f8c2 100644
--- a/scripts/run-visual-tests.js
+++ b/scripts/run-visual-tests.js
@@ -1,6 +1,52 @@
 const { execSync } = require('child_process');
 const git = require('nodegit');
 
+const checkoutOpts = {
+  checkoutStrategy: git.Checkout.STRATEGY.SAFE
+};
+
+(async function run() {
+  const repo = await git.Repository.open("./");
+
+  let currentBranch = await repo.getCurrentBranch();
+  const initialBranch = currentBranch.shorthand();
+
+  if (initialBranch === 'master') {
+    throw new Error("Must be on branch to test against master. Currently on master.")
+  }
+  console.log(displayCurrentBranch(currentBranch));
+
+  console.log('Switching to master');
+  await repo.checkoutBranch("master", checkoutOpts);
+  currentBranch = await repo.getCurrentBranch();
+  console.log(displayCurrentBranch(currentBranch));
+
+  console.log('running tests');
+  execSync('yarn start-test-server-and-visual-test', { stdio: [0,1,2] } );
+
+  console.log('Switching to ' + initialBranch);
+  await repo.checkoutBranch(initialBranch, checkoutOpts);
+  currentBranch = await repo.getCurrentBranch();
+  console.log(displayCurrentBranch(currentBranch));
+
+  console.log('running tests');
+  execSync('yarn start-test-server-and-visual-test', { stdio: [0,1,2] } );
+})()
+.then(function() {
+  console.log('Finished.')
+})
+.catch(function(err){
+  console.log(err);
+});
+
+function displayCurrentBranch(branch) {
+  return "Currently on " + branch.shorthand() + ": " + branch.target();
+}
+
+// stop script
+return;
+
+
 var initialBranch;
 
 (function IIFE(){
@@ -12,32 +58,32 @@ var initialBranch;
     .then(function(repo) {
       self.repo = repo;
       return self.repo.getCurrentBranch()
-    .then(function (branch) {
-        initialBranch = branch.shorthand();
-        if (initialBranch === 'master') {
-          throw new Error("Must be on branch to test against master. Currently on master.")
-        }
-        console.log(displayCurrentBranch(branch));
-      })
-    .then(function (){
-        console.log('Switching to master');
-        return self.repo.checkoutBranch("master", checkoutOpts)
-      })
-    .then(function(){
-        return self.repo.getCurrentBranch()
         .then(function (branch) {
-          console.log(displayCurrentBranch(branch));
-          execSync('yarn start-test-server-and-visual-test', { stdio: [0,1,2] } );
+            initialBranch = branch.shorthand();
+            if (initialBranch === 'master') {
+              throw new Error("Must be on branch to test against master. Currently on master.")
+            }
+            console.log(displayCurrentBranch(branch));
+          })
+        .then(function (){
+            console.log('Switching to master');
+            return self.repo.checkoutBranch("master", checkoutOpts)
+          })
+        .then(function(){
+            return self.repo.getCurrentBranch()
+              .then(function (branch) {
+                console.log(displayCurrentBranch(branch));
+                execSync('yarn start-test-server-and-visual-test', { stdio: [0,1,2] } );
+              })
+          })
+        .then(function() {
+          console.log('Switching to ' + initialBranch);
+          return self.repo.checkoutBranch(initialBranch, checkoutOpts)
         })
-      })
-      .then(function() {
-        console.log('Switching to ' + initialBranch);
-        return self.repo.checkoutBranch(initialBranch, checkoutOpts)
-      })
-      .then(self.repo.getCurrentBranch().then(function(branch) {
-        console.log(displayCurrentBranch(branch))
-        execSync('yarn start-test-server-and-visual-test', { stdio: [0,1,2] } )
-      }))
+        .then(self.repo.getCurrentBranch().then(function(branch) {
+          console.log(displayCurrentBranch(branch))
+          execSync('yarn start-test-server-and-visual-test', { stdio: [0,1,2] } )
+        }))
     })
     .catch(function(err){
       console.log(err);