diff --git a/.circleci/config.yml b/.circleci/config.yml
index f1d7855c8e..262066c28c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -122,7 +122,9 @@ jobs:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
     working_directory: ~/remix-project
-
+    parameters:
+      parts:
+        type: string
     parallelism: 95
     steps:
       - node/install:
@@ -147,7 +149,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -199,7 +201,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -230,7 +232,9 @@ jobs:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
     working_directory: ~/remix-project
-
+    parameters:
+      parts:
+        type: string
     parallelism: 95
     steps:
       - node/install:
@@ -252,7 +256,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -304,7 +308,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -356,7 +360,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -409,7 +413,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -462,7 +466,7 @@ jobs:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn
-      - run: 
+      - run:
           name: Java
           command: sudo apt update && sudo apt install default-jre
       - run:
@@ -608,9 +612,15 @@ workflows:
       - remix-ide-chrome:
           requires:
             - build
+          matrix:
+            parameters:
+              parts: ["1", "2", "3"]
       - remix-ide-firefox:
           requires:
             - build
+          matrix:
+            parameters:
+              parts: ["1", "2", "3"]
       - deploy-remix-live:
           requires:
             - lint
diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index 8a7237efce..9cd2f8d42b 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -131,21 +131,29 @@ module.exports = {
       .click('*[data-id="scConfigExpander"]')
       .waitForElementVisible('*[data-id="scFileConfiguration"]', 10000)
       .click('*[data-id="scFileConfiguration"]')
-      .waitForElementVisible('*[data-id="scConfigChangeFilePath"]', 10000)
-      .click('*[data-id="scConfigChangeFilePath"]')
-      .waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
-      .updateValue('*[data-id="scConfigFilePathInput"]', 'cf.json')
-      .sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
-      .waitForElementVisible('*[data-id="scConfigChangeFilePath"]', 10000)
-      .click('*[data-id="scConfigChangeFilePath"]')
-      .waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
-      .updateValue('*[data-id="scConfigFilePathInput"]', 'cf.json')
-      .sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
-      .waitForElementVisible('*[data-id="scConfigChangeFilePath"]', 10000)
-      .click('*[data-id="scConfigChangeFilePath"]')
+
+      .waitForElementVisible({
+        selector: '*[data-id="scConfigChangeFilePath"]',
+        abortOnFailure: false
+      }, 10000)
+      .click({
+        selector: '*[data-id="scConfigChangeFilePath"]',
+        suppressNotFoundErrors: true
+      })
+      .click({
+        selector: '*[data-id="scConfigChangeFilePath"]',
+        suppressNotFoundErrors: true
+      })
+      .click({
+        selector: '*[data-id="scConfigChangeFilePath"]',
+        suppressNotFoundErrors: true
+      })
+      
       .waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
       .updateValue('*[data-id="scConfigFilePathInput"]', 'cf.json')
+      
       .sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
+
       .openFile('Untitled.sol')
       .verifyContracts(['Ballot'], { wait: 2000, runs: '300' })
   },