diff --git a/ci/browser_tests_chrome.sh b/ci/browser_tests_chrome.sh
index fe356be28b..1fa610d844 100755
--- a/ci/browser_tests_chrome.sh
+++ b/ci/browser_tests_chrome.sh
@@ -22,7 +22,10 @@ setupRemixd
 sleep 5
 
 TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
-npm run nightwatch_local_chrome ${TESTFILES || exit 1;}
+ls
+for TESTFILE in $TESTFILES; do
+    ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || exit 1;
+done
 
 echo "$TEST_EXITCODE"
 if [ "$TEST_EXITCODE" -eq 1 ]
diff --git a/ci/browser_tests_firefox.sh b/ci/browser_tests_firefox.sh
index be90222fee..a5c5fa3b0a 100755
--- a/ci/browser_tests_firefox.sh
+++ b/ci/browser_tests_firefox.sh
@@ -22,7 +22,10 @@ setupRemixd
 sleep 5
 
 TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
-npm run nightwatch_local_firefox ${TESTFILES || exit 1;}
+ls
+for TESTFILE in $TESTFILES; do
+    ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || exit 1;
+done
 
 echo "$TEST_EXITCODE"
 if [ "$TEST_EXITCODE" -eq 1 ]
diff --git a/test-browser/helpers/init.js b/test-browser/helpers/init.js
index c4341a362b..1d01999473 100644
--- a/test-browser/helpers/init.js
+++ b/test-browser/helpers/init.js
@@ -14,11 +14,11 @@ module.exports = function (browser, callback, url, preloadPlugins = true) {
             .execute(() => {
               document.getElementById('autoCompile').click()
             })
-            .perform(function () {
-              callback()
-            })
           })
-        } else callback()
+        }
+      })
+      .perform(()=>{
+        callback()
       })
     })
 }