diff --git a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot
index 36c61368c..eefff003e 100644
--- a/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot
+++ b/ods_ci/tests/Resources/Page/ODH/JupyterHub/JupyterHubSpawner.robot
@@ -288,6 +288,9 @@ Spawn Notebook With Arguments  # robocop: disable
                 END
             END
             Spawn Notebook    ${spawner_timeout}    ${same_tab}
+            Run Keyword And Continue On Failure    Wait Until Page Contains    Log in with OpenShift    timeout=15s
+            ${oauth_prompt_visible} =    Is OpenShift OAuth Login Prompt Visible
+            IF  ${oauth_prompt_visible}    Click Button     Log in with OpenShift
             Run Keyword And Warn On Failure   Login To Openshift  ${username}  ${password}  ${auth_type}
             ${authorization_required} =  Is Service Account Authorization Required
             IF  ${authorization_required}  Authorize jupyterhub service account
diff --git a/ods_ci/tests/Tests/500__jupyterhub/autoscaling-gpus.robot b/ods_ci/tests/Tests/500__jupyterhub/autoscaling-gpus.robot
index 3de026c01..502cbf0ef 100644
--- a/ods_ci/tests/Tests/500__jupyterhub/autoscaling-gpus.robot
+++ b/ods_ci/tests/Tests/500__jupyterhub/autoscaling-gpus.robot
@@ -60,6 +60,9 @@ Spawn Notebook And Trigger Autoscale
     Select Container Size    Small
     Set Number Of Required GPUs    1
     Spawn Notebook    spawner_timeout=20 minutes  expect_autoscaling=${True}
+    Run Keyword And Continue On Failure    Wait Until Page Contains    Log in with OpenShift    timeout=15s
+    ${oauth_prompt_visible} =    Is OpenShift OAuth Login Prompt Visible
+    IF  ${oauth_prompt_visible}    Click Button     Log in with OpenShift
     Run Keyword And Warn On Failure   Login To Openshift  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
     ${authorization_required} =  Is Service Account Authorization Required
     IF  ${authorization_required}  Authorize jupyterhub service account
diff --git a/ods_ci/tests/Tests/500__jupyterhub/test.robot b/ods_ci/tests/Tests/500__jupyterhub/test.robot
index 6270a6d94..42aa3cf57 100644
--- a/ods_ci/tests/Tests/500__jupyterhub/test.robot
+++ b/ods_ci/tests/Tests/500__jupyterhub/test.robot
@@ -75,6 +75,9 @@ Can Spawn Notebook
     # TODO: Verify why error isn't appearing within 1 minute
     # Verify Notebook Spawner Modal Does Not Get Stuck When Requesting Too Many Resources To Spawn Server
     Spawn Notebook  same_tab=${False}
+    Run Keyword And Continue On Failure    Wait Until Page Contains    Log in with OpenShift    timeout=15s
+    ${oauth_prompt_visible} =    Is OpenShift OAuth Login Prompt Visible
+    IF  ${oauth_prompt_visible}    Click Button     Log in with OpenShift
     Login To Openshift  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
     ${authorization_required} =  Is Service Account Authorization Required
     IF  ${authorization_required}  Authorize jupyterhub service account