diff --git a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
index da38485359..445bae9231 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
@@ -16,8 +16,9 @@ module.exports = {
     'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
         browser.
             clickLaunchIcon('dgit')
-            .waitForElementVisible('*[data-id="initgit-btn"]')
-            .click('*[data-id="initgit-btn"]')
+            // .waitForElementVisible('*[data-id="initgit-btn"]')
+            // .click('*[data-id="initgit-btn"]')
+            .waitForElementVisible('*[data-id="githubToken"]')
             .setValue('*[data-id="githubToken"]', process.env.dgit_token)
             .setValue('*[data-id="gitubUsername"]', 'git')
             .setValue('*[data-id="githubEmail"]', 'git@example.com')
diff --git a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
index fc0ec93f98..9e79bf3920 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
@@ -34,8 +34,9 @@ module.exports = {
     'Update settings for git #group1 #group2 #group3 #group4': function (browser: NightwatchBrowser) {
         browser.
             clickLaunchIcon('dgit')
-            .waitForElementVisible('*[data-id="initgit-btn"]')
-            .click('*[data-id="initgit-btn"]')
+            // .waitForElementVisible('*[data-id="initgit-btn"]')
+            // .click('*[data-id="initgit-btn"]')
+            .waitForElementVisible('*[data-id="gitubUsername"]')
             .setValue('*[data-id="gitubUsername"]', 'git')
             .setValue('*[data-id="githubEmail"]', 'git@example.com')
             .click('*[data-id="saveGitHubCredentials"]')
diff --git a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
index 0661eb31ee..c25da43ef7 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -421,8 +421,9 @@ module.exports = {
   'Update settings for git #group5': function (browser: NightwatchBrowser) {
     browser.
       clickLaunchIcon('dgit')
-      .waitForElementVisible('*[data-id="initgit-btn"]')
-      .click('*[data-id="initgit-btn"]')
+      // .waitForElementVisible('*[data-id="initgit-btn"]')
+      // .click('*[data-id="initgit-btn"]')
+      .waitForElementVisible('*[data-id="gitubUsername"]')
       .setValue('*[data-id="gitubUsername"]', 'git')
       .setValue('*[data-id="githubEmail"]', 'git@example.com')
       .click('*[data-id="saveGitHubCredentials"]')