diff --git a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
index 50116dec42..31d8a96078 100644
--- a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
+++ b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
@@ -15,21 +15,9 @@ class addAtAddressInstance extends EventEmitter {
 
 function addInstance (browser: NightwatchBrowser, address: string, isValidFormat: boolean, isValidChecksum: boolean, callback: VoidFunction) {
   browser.clickLaunchIcon('udapp').clearValue('.ataddressinput').setValue('.ataddressinput', address, function () {
-    browser.click('button[id^="runAndDeployAtAdressButton"]')
-      .execute(function () {
-        const ret = document.querySelector('div[class^="modal-body"] div').innerHTML
-        const modal = document.querySelector('#modal-footer-ok') as HTMLElement
-
-        modal.click()
-        return ret
-      }, [], function (result) {
-        if (!isValidFormat) {
-          browser.assert.equal(result.value, 'Invalid address.')
-        } else if (!isValidChecksum) {
-          browser.assert.equal(result.value, 'Invalid checksum address.')
-        }
-        callback()
-      })
+    if (!isValidFormat || !isValidChecksum)
+      browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled')
+    else callback()
   })
 }
 
diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index 4728197006..2fbdb2a0bb 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -36,19 +36,19 @@ module.exports = {
         })
   },
 
-  'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
-    browser.pause(500)
-      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
-      .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
-    // .clickLaunchIcon('debugger')
-      .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
-      .pause(2000)
-      .waitForElementVisible('#stepdetail')
-      .goToVMTraceStep(79)
-      .pause(1000)
-      .checkVariableDebug('soliditystate', stateCheck)
-      .checkVariableDebug('soliditylocals', localsCheck)
-  },
+  // 'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
+  //   browser.pause(500)
+  //     .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+  //     .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
+  //   // .clickLaunchIcon('debugger')
+  //     .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
+  //     .pause(2000)
+  //     .waitForElementVisible('#stepdetail')
+  //     .goToVMTraceStep(79)
+  //     .pause(1000)
+  //     .checkVariableDebug('soliditystate', stateCheck)
+  //     .checkVariableDebug('soliditylocals', localsCheck)
+  // },
 
   'Access Ballot via at address': function (browser: NightwatchBrowser) {
     browser.clickLaunchIcon('udapp')