diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java
index 4c048a833d4..e4a1d644391 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java
@@ -483,10 +483,10 @@ protected String acceptAuthorization(WebDriver currentDriver, String redirectUri
                 authorizationResponseStr = waitForPageSwitch(currentDriver, authorizationResponseStr);
             }
         } else {
-            if (authorizationResponseStr.contains("#code=")) {
+            if (authorizationResponseStr.contains("code=") || authorizationResponseStr.contains("access_token=")) {
                 return authorizationResponseStr;
             }
-            fail("The authorization form was expected to be shown.");
+            fail("The authorization form was expected to be shown. authorizationResponseStr:" + authorizationResponseStr);
         }
 
         return authorizationResponseStr;