diff --git a/apps/remix-ide/ci/browser_tests.sh b/apps/remix-ide/ci/browser_tests.sh
index 1e3012feb4..4a093f6b5d 100755
--- a/apps/remix-ide/ci/browser_tests.sh
+++ b/apps/remix-ide/ci/browser_tests.sh
@@ -22,7 +22,7 @@ setupRemixd
 sleep 5
 
 npm run nightwatch_parallel || TEST_EXITCODE=1
-TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split )
 for TESTFILE in $TESTFILES; do
     ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
 done
diff --git a/apps/remix-ide/ci/browser_tests_chrome_1.sh b/apps/remix-ide/ci/browser_tests_chrome_1.sh
index 3858bb977f..46f0dbcdce 100755
--- a/apps/remix-ide/ci/browser_tests_chrome_1.sh
+++ b/apps/remix-ide/ci/browser_tests_chrome_1.sh
@@ -15,9 +15,9 @@ sleep 5
 
 npm run build:e2e
 
-TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.test" | sort | xargs basename | circleci tests split --split-by=timings)
+TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.test" | sort | circleci tests split )
 for TESTFILE in $TESTFILES; do
-    npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/$TESTFILE --env=chrome  || TEST_EXITCODE=1
+    npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome  || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"
diff --git a/apps/remix-ide/ci/browser_tests_chrome_2.sh b/apps/remix-ide/ci/browser_tests_chrome_2.sh
index a94ff93f4a..2e42c43db4 100755
--- a/apps/remix-ide/ci/browser_tests_chrome_2.sh
+++ b/apps/remix-ide/ci/browser_tests_chrome_2.sh
@@ -15,7 +15,7 @@ sleep 5
 
 npm run build:e2e
 
-TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.spec.js" | circleci tests split --split-by=timings)
+TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec" | sort | circleci tests split )
 for TESTFILE in $TESTFILES; do
     npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome  || TEST_EXITCODE=1
 done
diff --git a/apps/remix-ide/ci/browser_tests_firefox_1.sh b/apps/remix-ide/ci/browser_tests_firefox_1.sh
index 96eb2ff7fb..4cfaf7e763 100755
--- a/apps/remix-ide/ci/browser_tests_firefox_1.sh
+++ b/apps/remix-ide/ci/browser_tests_firefox_1.sh
@@ -15,7 +15,7 @@ sleep 5
 
 npm run build:e2e
 
-TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings)
+TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.test" | sort | circleci tests split )
 for TESTFILE in $TESTFILES; do
     npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=firefox  || TEST_EXITCODE=1
 done
diff --git a/apps/remix-ide/ci/browser_tests_firefox_2.sh b/apps/remix-ide/ci/browser_tests_firefox_2.sh
index 584459a5c9..c239ff9ae3 100755
--- a/apps/remix-ide/ci/browser_tests_firefox_2.sh
+++ b/apps/remix-ide/ci/browser_tests_firefox_2.sh
@@ -15,7 +15,7 @@ sleep 5
 
 npm run build:e2e
 
-TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.spec.js" | circleci tests split --split-by=timings)
+TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec" | sort | circleci tests split )
 for TESTFILE in $TESTFILES; do
     npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=firefox  || TEST_EXITCODE=1
 done