keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java
index f3312d9..b19daeb 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java
@@ -16,10 +16,13 @@
  */
 package org.keycloak.testsuite.auth.page.login;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
+import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
+
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
  */
@@ -42,6 +45,7 @@ public class OAuthGrant extends LoginActions {
 
     public boolean isCurrent(WebDriver driver1) {
         if (driver1 == null) driver1 = driver;
+        waitUntilElement(By.tagName("body")).is().present();
         return driver1.getPageSource().contains("Do you grant these access privileges");
     }
 

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/JavascriptAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/JavascriptAdapterTest.java
index 10361a6..ac9a10f 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/JavascriptAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/javascript/JavascriptAdapterTest.java
@@ -22,6 +22,7 @@ import org.keycloak.testsuite.util.JavascriptBrowser;
 import org.keycloak.testsuite.util.OAuthClient;
 import org.keycloak.testsuite.util.RealmBuilder;
 import org.keycloak.testsuite.util.UserBuilder;
+import org.openqa.selenium.By;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
@@ -93,6 +94,7 @@ public class JavascriptAdapterTest extends AbstractJavascriptTest {
     }
 
     private void assertOnTestAppUrl(WebDriver jsDriver, Object output, WebElement events) {
+        waitUntilElement(By.tagName("body")).is().present();
         assertCurrentUrlStartsWith(testAppUrl, jsDriver);
     }
 
@@ -222,8 +224,10 @@ public class JavascriptAdapterTest extends AbstractJavascriptTest {
     public void implicitFlowQueryTest() {
         setImplicitFlowForClient();
         testExecutor.init(defaultArguments().implicitFlow().queryResponse(), this::assertInitNotAuth)
-                .login(((driver1, output, events) ->
-                        Assert.assertThat(driver1.getCurrentUrl(), containsString("Response_mode+%27query%27+not+allowed"))));
+                .login(((driver1, output, events) -> {
+                    waitUntilElement(By.tagName("body")).is().present();
+                    Assert.assertThat(driver1.getCurrentUrl(), containsString("Response_mode+%27query%27+not+allowed"));
+                }));
         setStandardFlowForClient();
     }