diff --git a/apps/remix-ide/ci/browser_tests.sh b/apps/remix-ide/ci/browser_tests.sh
index d8ea9eb38c..cb745b9c6b 100755
--- a/apps/remix-ide/ci/browser_tests.sh
+++ b/apps/remix-ide/ci/browser_tests.sh
@@ -22,9 +22,8 @@ setupRemixd
 sleep 5
 
 TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
-ls
 for TESTFILE in $TESTFILES; do
-    ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || exit 1;
+    ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"
diff --git a/ci/browser_tests_firefox.sh b/ci/browser_tests_firefox.sh
new file mode 100755
index 0000000000..8ba2bacf06
--- /dev/null
+++ b/ci/browser_tests_firefox.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -e
+
+setupRemixd () {
+  mkdir remixdSharedfolder
+  cd contracts
+  echo 'sharing folder: '
+  echo $PWD
+  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
+  cd ..
+}
+
+BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
+echo "$BUILD_ID"
+TEST_EXITCODE=0
+
+npm run ganache-cli &
+npm run serve &
+setupRemixd
+
+sleep 5
+
+TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+for TESTFILE in $TESTFILES; do
+    ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
+done
+
+echo "$TEST_EXITCODE"
+if [ "$TEST_EXITCODE" -eq 1 ]
+then
+  exit 1
+fi