diff --git a/apps/remix-ide-e2e/src/commands/addFile.ts b/apps/remix-ide-e2e/src/commands/addFile.ts
index f9536bb259..8a2fed0381 100644
--- a/apps/remix-ide-e2e/src/commands/addFile.ts
+++ b/apps/remix-ide-e2e/src/commands/addFile.ts
@@ -29,10 +29,9 @@ function addFile (browser: NightwatchBrowser, name: string, content: NightwatchC
           .waitForElementContainsText('*[data-id$="/blank"]', '', 60000)
           .sendKeys('*[data-id$="/blank"] .remixui_items', name)
           .sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER)
-          .pause(2000)
           .waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000)
+          .waitForElementVisible('xpath', `//*[@data-id='tab-active' and contains(.,'${name}')]`, 60000)
           .setEditorValue(content.content)
-          .pause(1000)
           .perform(function () {
             done()
           })
diff --git a/apps/remix-ide-e2e/src/tests/debugger.test.ts b/apps/remix-ide-e2e/src/tests/debugger.test.ts
index c3bdf2c4c8..0f1ff1a7e3 100644
--- a/apps/remix-ide-e2e/src/tests/debugger.test.ts
+++ b/apps/remix-ide-e2e/src/tests/debugger.test.ts
@@ -12,6 +12,10 @@ module.exports = {
     return sources
   },
 
+  'addfiletest #group10': function (browser: NightwatchBrowser) {
+    browser.addFile('test.sol', sources[0]['blah.sol'])
+  },
+
   'Should launch debugger #group1': function (browser: NightwatchBrowser) {
     browser.addFile('blah.sol', sources[0]['blah.sol'])
       .clickLaunchIcon('udapp')