diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10197c3f8a..4109095008 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   run_flaky_tests:
     type: boolean
-    default: false
+    default: true
 orbs:
   browser-tools: circleci/browser-tools@1.4.0
 jobs:
@@ -81,7 +81,7 @@ jobs:
         type: string
       jobsize:
         type: string
-    parallelism: 10
+    parallelism: 50
     steps:
       - browser-tools/install-browser-tools
       - run:
@@ -90,7 +90,6 @@ jobs:
             firefox --version
             geckodriver --version
             chromedriver --version
-            java -jar /usr/local/bin/selenium.jar --version
       - run:
           name: Check out previous test metadata
           command: |
@@ -107,9 +106,10 @@ jobs:
       - run: yarn
       - run: yarn run downloadsolc_assets_e2e && yarn run downloadsolc_assets_dist
       - run: ls -la ./dist/apps/remix-ide/assets/js
+      - run: yarn run selenium-install
       - run:
           name: Start Selenium
-          command: java -jar /usr/local/bin/selenium.jar
+          command: yarn run selenium
           background: true
       - run: ./apps/remix-ide/ci/<< parameters.script >> << parameters.browser >> << parameters.jobsize >> << parameters.job >>
       - store_test_results:
@@ -141,7 +141,6 @@ jobs:
             firefox --version
             geckodriver --version
             chromedriver --version
-            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
       - attach_workspace:
@@ -153,9 +152,10 @@ jobs:
       - run: yarn
       - run: unzip ./persist/dist.zip
       - run: yarn run downloadsolc_assets_e2e && yarn run downloadsolc_assets_dist
+      - run: yarn run selenium-install
       - run:
           name: Start Selenium
-          command: java -jar /usr/local/bin/selenium.jar
+          command: yarn run selenium
           background: true
       - run: ./apps/remix-ide/ci/<< parameters.script >>
       - store_test_results: