diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5a065c41d..a95ed97b6b 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
diff --git a/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts b/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts
index 8af5c611d9..b3fb9ecd65 100644
--- a/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts
+++ b/apps/remix-ide-e2e/src/tests/runAndDeploy.test.ts
@@ -153,7 +153,7 @@ module.exports = {
       .waitForElementContainsText('[data-id="treeViewLi0"]', 'uint256: 10')
   },
 
-  'Should save state after running web3 script #group4': function (browser: NightwatchBrowser) {
+  'Should save state after running web3 script #flaky #group4': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('settings')
       .waitForElementPresent('[data-id="settingsTabGenerateContractMetadataLabel"]')
@@ -163,16 +163,17 @@ module.exports = {
       .click('.remixui_compilerConfigSection')
       .setValue('#evmVersionSelector', 'london')
       .click('*[data-id="compilerContainerCompileBtn"]')
-      .pause(5000)
       .clickLaunchIcon('udapp')
       .switchEnvironment('vm-london')
       .clickLaunchIcon('filePanel')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
       .click('*[data-id="treeViewLitreeViewItemscripts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/deploy_with_web3.ts"]')
       .openFile('scripts/deploy_with_web3.ts')
       .click('[data-id="play-editor"]')
       .waitForElementPresent('[data-id="treeViewDivDraggableItem.states/vm-london/state.json"]')
       .click('[data-id="treeViewDivDraggableItem.states/vm-london/state.json"]')
-      .pause(100000)
+      .pause(1000)
       .getEditorValue((content) => {
         browser
           .assert.ok(content.includes('"latestBlockNumber": "0x1"'), 'State is saved')