diff --git a/vaadin-platform-test/src/test/java/com/vaadin/platform/test/ComponentsIT.java b/vaadin-platform-test/src/test/java/com/vaadin/platform/test/ComponentsIT.java
index fa9f8aee8..a6fcbf9b7 100644
--- a/vaadin-platform-test/src/test/java/com/vaadin/platform/test/ComponentsIT.java
+++ b/vaadin-platform-test/src/test/java/com/vaadin/platform/test/ComponentsIT.java
@@ -72,6 +72,7 @@ public void appWorks() throws Exception {
     private <T extends TestBenchElement> void checkElement(TestComponent testComponent) {
         // Make sure that we close any modal dialog before each iteration
         $("body").first().click();
+        waitUntil(driver->!$("vaadin-dialog-overlay").exists(), 30);
 
         String tag = testComponent.localName != null ? testComponent.localName : testComponent.tag;
         String className = testComponent.component != null ? testComponent.component.getName() : null;
diff --git a/versions.json b/versions.json
index c860bc827..fc08456b9 100644
--- a/versions.json
+++ b/versions.json
@@ -583,7 +583,7 @@
             "pro": true
         },
         "vaadin-testbench": {
-            "javaVersion": "9.5.3",
+            "javaVersion": "9.5-SNAPSHOT",
             "pro": true
         }
     }