1 files changed, 15 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
index 5dd59a8245..f035ef35f6 100644
--- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
+++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.tests.integration;
 
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.UIElement;
 import com.vaadin.testbench.parallel.TestNameSuffix;
 import com.vaadin.tests.tb3.PrivateTB3Configuration;
 
@@ -37,4 +39,17 @@ public abstract class AbstractIntegrationTest extends PrivateTB3Configuration {
         return deploymentUrl;
     }
 
+    @Override
+    protected void openTestURL() {
+        super.openTestURL();
+
+        waitForApplication();
+    }
+
+    protected void waitForApplication() {
+        if (!isElementPresent(UIElement.class)) {
+            // Wait for UI element.
+            waitForElementPresent(By.vaadin("//com.vaadin.ui.UI"));
+        }
+    }
 }