diff --git a/.circleci/config.yml b/.circleci/config.yml
index 80390cfae9..6a1c47cb6c 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.4
   win: circleci/windows@5.0
@@ -784,7 +784,7 @@ workflows:
               script: ["flaky.sh"]
               job: ["nogroup"]
               jobsize: ["1"]
-              parallelism: [10]
+              parallelism: [1]
   build_all:
     unless: << pipeline.parameters.run_flaky_tests >>
     jobs:
diff --git a/apps/remix-ide-e2e/src/tests/metamask.test.ts b/apps/remix-ide-e2e/src/tests/metamask.test.ts
index f65841dde3..117256ee6a 100644
--- a/apps/remix-ide-e2e/src/tests/metamask.test.ts
+++ b/apps/remix-ide-e2e/src/tests/metamask.test.ts
@@ -67,7 +67,7 @@ const tests = {
       .switchBrowserTab(0) // back to remix
   },
 
-  'Should add a contract file #group1': function (browser: NightwatchBrowser) {
+  'Should add a contract file #flaky #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]')
       .clickLaunchIcon('filePanel')
       .addFile('Greet.sol', sources[0]['Greet.sol'])
@@ -193,7 +193,7 @@ const tests = {
   },
 
   // main network tests
-  'Should connect to Ethereum Main Network using MetaMask #group2': function (browser: NightwatchBrowser) {
+  'Should connect to Ethereum Main Network using MetaMask #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
       .switchBrowserTab(1)
       .click('[data-testid="network-display"]')
@@ -208,7 +208,7 @@ const tests = {
       .assert.containsText('*[data-id="settingsNetworkEnv"]', 'Main (1) network')
   },
 
-  'Should deploy contract on Ethereum Main Network using MetaMask #group2': function (browser: NightwatchBrowser) {
+  'Should deploy contract on Ethereum Main Network using MetaMask #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
       .clickLaunchIcon('filePanel')
       .addFile('Greet.sol', sources[0]['Greet.sol'])