diff --git a/tests/ui/test_readme_validate_other_features.py b/tests/ui/test_readme_validate_other_features.py
index 8137aee5..08e6bb58 100644
--- a/tests/ui/test_readme_validate_other_features.py
+++ b/tests/ui/test_readme_validate_other_features.py
@@ -25,11 +25,18 @@ def test_readme_validate_other_features(
 
         github_login_window.click(sign_in_button_selector)
 
+    if home.continue_with_github_is_visible:
+        home.click_continue_with_github_button()
+
     if home.gitpod_user_dropdown.inner_text() != "0 openstax":
         home.click_gitpod_user_dropdown()
         home.click_gitpod_user_selector()
 
-    home.click_workspace_continue_button()
+    if home.continue_with_github_is_visible:
+        home.click_continue_with_github_button()
+
+    if home.continue_with_workspace_is_visible:
+        home.click_workspace_continue_button()
 
     # THEN: openstax extension launches and icon appears
     assert home.openstax_icon_is_visible
diff --git a/tests/ui/test_toc_editor.py b/tests/ui/test_toc_editor.py
index 9977accd..0b5f7c8f 100644
--- a/tests/ui/test_toc_editor.py
+++ b/tests/ui/test_toc_editor.py
@@ -14,7 +14,6 @@ def test_toc_editor(chrome_page, github_user, github_password, gitpod_repo_url):
     chrome_page.goto(gitpod_repo_url)
     home = HomePoet(chrome_page)
 
-    # WHEN: login into openstax/osbooks-otto-book repo
     if home.continue_with_github_is_visible:
         home.click_continue_with_github_button()
 
@@ -24,11 +23,18 @@ def test_toc_editor(chrome_page, github_user, github_password, gitpod_repo_url):
 
         github_login_window.click(sign_in_button_selector)
 
+    if home.continue_with_github_is_visible:
+        home.click_continue_with_github_button()
+
     if home.gitpod_user_dropdown.inner_text() != "0 openstax":
         home.click_gitpod_user_dropdown()
         home.click_gitpod_user_selector()
 
-    home.click_workspace_continue_button()
+    if home.continue_with_github_is_visible:
+        home.click_continue_with_github_button()
+
+    if home.continue_with_workspace_is_visible:
+        home.click_workspace_continue_button()
 
     # THEN: openstax extension launches and icon appears
     assert home.openstax_icon_is_visible