diff --git a/apps/remix-ide-e2e/src/tests/metamask.test.ts b/apps/remix-ide-e2e/src/tests/metamask.test.ts
index f89016d76c1..cb57810e82a 100644
--- a/apps/remix-ide-e2e/src/tests/metamask.test.ts
+++ b/apps/remix-ide-e2e/src/tests/metamask.test.ts
@@ -77,7 +77,7 @@ const tests = {
   },
 
   'Should deploy contract on Sepolia Test Network using MetaMask #group1': function (browser: NightwatchBrowser) {
-    browser.clearConsole().waitForElementPresent('*[data-id="runTabSelectAccount"] option', 45000)
+    browser.clearConsole().waitForElementPresent('*[data-id="runTabSelectAccount"] a', 45000)
       .clickLaunchIcon('filePanel')
       .openFile('Greet.sol')
       .clickLaunchIcon('udapp')
@@ -169,7 +169,7 @@ const tests = {
       })
   },
   'Should deploy contract on Sepolia Test Network using MetaMask again #group1': function (browser: NightwatchBrowser) {
-    browser.clearConsole().waitForElementPresent('*[data-id="runTabSelectAccount"] option', 45000)
+    browser.clearConsole().waitForElementPresent('*[data-id="runTabSelectAccount"] a', 45000)
       .clickLaunchIcon('filePanel')
       .openFile('Greet.sol')
       .clickLaunchIcon('udapp')
@@ -210,7 +210,7 @@ const tests = {
   },
 
   'Should deploy contract on Ethereum Main Network using MetaMask #group1': function (browser: NightwatchBrowser) {
-    browser.waitForElementPresent('*[data-id="runTabSelectAccount"] option')
+    browser.waitForElementPresent('*[data-id="runTabSelectAccount"] a')
       .clickLaunchIcon('filePanel')
       .addFile('Greet.sol', sources[0]['Greet.sol'])
       .clickLaunchIcon('udapp')
@@ -408,11 +408,11 @@ const sources = [
       pragma solidity ^0.8.0;
       contract HelloWorld {
           string public message;
-          
+
           fallback () external {
               message = 'Hello World!';
           }
-          
+
           function greet(string memory _message) public {
               message = _message;
           }
diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
index b20eac082c5..2f81e34bdc6 100644
--- a/apps/remix-ide-e2e/src/tests/terminal.test.ts
+++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts
@@ -302,7 +302,7 @@ module.exports = {
         .switchEnvironment('vm-mainnet-fork')
         .waitForElementPresent({
           locateStrategy: 'css selector',
-          selector: 'select[data-id="runTabSelectAccount"] option[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
+          selector: 'select[data-id="runTabSelectAccount"] *[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
           timeout: 240000
         })
         .executeScriptInTerminal(`web3.eth.getCode('0x180587b00c8642e2c7ac3a758712d97e6f7bdcc7')`) // mainnet contract
@@ -332,7 +332,7 @@ module.exports = {
         .modalFooterOKClick('vm-custom-fork')
         .waitForElementPresent({
           locateStrategy: 'css selector',
-          selector: 'select[data-id="runTabSelectAccount"] option[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
+          selector: 'select[data-id="runTabSelectAccount"] *[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
           timeout: 240000
         })
         .pause(5000)
@@ -361,10 +361,10 @@ module.exports = {
         Resolver resolver = ens.resolver(node);
         console.log(resolver.addr(node));
     }
-    `    
+    `
     if (runMasterTests) {
       const path = "//*[@class='view-line' and contains(.,'resolveENS') and contains(.,'view')]//span//span[contains(.,'(')]"
-      
+
       browser
         // .clickLaunchIcon('udapp')
         .switchEnvironment('vm-mainnet-fork')
@@ -401,8 +401,8 @@ module.exports = {
       .waitForElementVisible('#editorView')
       .pause(10000) // the parser need to parse the code
       .useXpath()
-      .scrollToLine(3)      
-      .click(path)      
+      .scrollToLine(3)
+      .click(path)
       .perform(function () {
         const actions = this.actions({ async: true });
         return actions
diff --git a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
index 019d3659aa6..18ae3269a6f 100644
--- a/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
+++ b/apps/remix-ide-e2e/src/tests/transactionExecution.test.ts
@@ -247,7 +247,7 @@ module.exports = {
       .switchEnvironment('vm-mainnet-fork')
       .waitForElementPresent({
         locateStrategy: 'css selector',
-        selector: 'select[data-id="runTabSelectAccount"] option[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
+        selector: 'select[data-id="runTabSelectAccount"] *[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
         timeout: 250000
       }) // wait for the udapp to load the list of accounts
       .selectContract('MyResolver')