diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index dab5c3a879..b68299e79f 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -9,71 +9,71 @@ const testData = {
 }
 
 module.exports = {
+  '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     init(browser, done)
   },
 
-  'Import from GitHub Modal': function (browser: NightwatchBrowser) {
+  'Import from GitHub Modal #group1': function (browser: NightwatchBrowser) {
     browser.clickLaunchIcon('home')
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .clickLaunchIcon('filePanel')
       .click('div[title="home"]')
       .waitForElementVisible('button[data-id="landingPageImportFromGitHubButton"]')
       .pause(1000)
-      .scrollAndClick('button[data-id="landingPageImportFromGitHubButton"]')
+      .click('button[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('*[data-id="homeTabModalDialogModalTitle-react"]')
       .assert.containsText('*[data-id="homeTabModalDialogModalTitle-react"]', 'Import from Github')
       .waitForElementVisible('*[data-id="homeTabModalDialogModalBody-react"]')
       .assert.containsText('*[data-id="homeTabModalDialogModalBody-react"]', 'Enter the github URL you would like to load.')
-      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
-      .refresh()
+      .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]')
   },
 
-  'Display Error Message For Invalid GitHub URL Modal': function (browser: NightwatchBrowser) {
+  'Display Error Message For Invalid GitHub URL Modal #group1': function (browser: NightwatchBrowser) {
     browser
-      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
-      .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]')
       .execute(() => {
         (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
-      }, [], () => {})
+      }, [], () => { })
       .setValue('input[data-id="homeTabModalDialogCustomPromptText"]', testData.invalidURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
-      .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]') // submitted
+      .click('[data-id="homeTab-modal-footer-ok-react"]') // submitted
       .waitForElementVisible('*[data-shared="tooltipPopup"]')
       .assert.containsText('*[data-shared="tooltipPopup"] span', 'not found ' + testData.invalidURL)
   },
 
-  'Import From Github For Valid URL': function (browser: NightwatchBrowser) {
+  'Import From Github For Valid URL #group2': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
-      .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
-      .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .clickLaunchIcon('filePanel')
+      .click('div[title="home"]')
+      .waitForElementVisible('button[data-id="landingPageImportFromGitHubButton"]').pause(1000)
+      .click('button[data-id="landingPageImportFromGitHubButton"]')
+      .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]')
       .execute(() => {
         (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
-      }, [], () => {})
+      }, [], () => { })
+      .clearValue('input[data-id="homeTabModalDialogCustomPromptText"]').pause(1000)
       .setValue('input[data-id="homeTabModalDialogCustomPromptText"]', testData.validURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
-      .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')
+      .click('[data-id="homeTab-modal-footer-ok-react"]')
       .openFile('github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')
       .waitForElementVisible("div[title='default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol'")
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf('library Roles {') !== -1, 'content does contain "library Roles {"')
       })
   },
-  'Import JSON From Github For Valid URL': function (browser: NightwatchBrowser) {
+  'Import JSON From Github For Valid URL #group2': function (browser: NightwatchBrowser) {
     browser
       .click('div[title="home"]')
-      .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
-      .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .click('button[data-id="landingPageImportFromGitHubButton"]')
+      .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]').pause(1000)
       .execute(() => {
         (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
-      }, [], () => {})
+      }, [], () => { })
+      .clearValue('input[data-id="homeTabModalDialogCustomPromptText"]').pause(1000)
       .setValue('input[data-id="homeTabModalDialogCustomPromptText"]', testData.JSON)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
-      .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')
+      .click('[data-id="homeTab-modal-footer-ok-react"]')
       .openFile('github/ethereum/remix-project/package.json')
       .waitForElementVisible("div[title='default_workspace/github/ethereum/remix-project/package.json'")
       .getEditorValue((content) => {