diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
index 713d13b81a..1022471188 100644
--- a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
+++ b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -6,7 +6,6 @@ module.exports = {
   '@disabled': true,
   'Should load the testmigration url #group1': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
-      .hideToolTips()
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow()
@@ -14,10 +13,10 @@ module.exports = {
       .click('*[data-id="skipbackup-btn"]')
       .pause(5000)
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .hideToolTips()
   },
   'Should load the testmigration url and refresh and still have test data #group7': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
-      .hideToolTips() 
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow()
@@ -25,6 +24,7 @@ module.exports = {
       .click('*[data-id="skipbackup-btn"]')
       .pause(5000)
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .hideToolTips()
       .refreshPage()
   },
   'should have indexedDB storage in terminal #group1 #group7': function (browser: NightwatchBrowser) {
@@ -38,6 +38,7 @@ module.exports = {
       .maximizeWindow()
       .pause(5000)
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .hideToolTips()
       .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
       .openFile('README.txt')
       .waitForElementVisible('*[id="editorView"]', 10000)
@@ -53,7 +54,6 @@ module.exports = {
   },
   'Should load the testmigration url with local storage anabled #group3': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true&e2e_testmigration_fallback=true')
-      .hideToolTips()
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow()
@@ -61,10 +61,10 @@ module.exports = {
       .click('*[data-id="skipbackup-btn"]')
       .pause(5000)
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .hideToolTips()
   },
   'Should generate error in migration by deleting indexedDB and falling back to local storage with test #group5': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
-      .hideToolTips()
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow().execute(('delete window.indexedDB'))
@@ -72,6 +72,7 @@ module.exports = {
       .click('*[data-id="skipbackup-btn"]')
       .pause(5000)
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .hideToolTips()
   },
   'should have localstorage storage in terminal #group2 #group3 #group5': function (browser: NightwatchBrowser) {
     browser.assert.containsText('*[data-id="terminalJournal"]', 'localstorage')
@@ -125,12 +126,13 @@ module.exports = {
   },
   'Should with errors #group6': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
-      .hideToolTips()
+
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow().execute('delete window.localStorage')
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
+      .hideToolTips()
       .assert.containsText('.alert-danger', 'An unknown error')
   },