diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
index 08522ffe..1d81dd6b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
@@ -40,10 +40,14 @@ public class TestBrowserTypeBasic extends TestBase {
     assertEquals(getBrowserNameFromEnv(), browserType.name());
   }
 
+  static boolean isChromiumOrWebKit() {
+    return isChromium() || isWebKit();
+  }
+
   @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Non-chromium behavior")
+  @DisabledIf(value="isChromiumOrWebKit", disabledReason="Connecting over CDP is supported in Chromium and WebKit")
   void shouldThrowWhenTryingToConnectWithNotChromium() {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> browserType.connectOverCDP("foo"));
-    assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium."));
+    assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium and WebKit."));
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
index 098dea19..2b7db6c3 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
@@ -259,7 +259,9 @@ public class TestBrowserTypeConnect extends TestBase {
     }
     assertFalse(browser.isConnected());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.waitForNavigation(() -> {}));
-    assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
+    assertTrue(e.getMessage().contains("Browser closed") ||
+      e.getMessage().contains("Page closed") ||
+      e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
   @Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
index f70e2cbd..f90f895f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
@@ -30,7 +30,7 @@ public class TestPageEventPageError extends TestBase {
     page.evaluate("async () => {\n" +
       "    for (let i = 0; i < 301; i++)\n" +
       "      window.setTimeout(() => { throw new Error('error' + i); }, 0);\n" +
-      "    await new Promise(f => window.setTimeout(f, 100));\n" +
+      "    await new Promise(f => window.setTimeout(f, 2000));\n" +
       "  }");
 
     List<String> errors = page.pageErrors();
diff --git a/playwright/src/test/resources/expectations/hide-should-work-firefox.png b/playwright/src/test/resources/expectations/hide-should-work-firefox.png
index 7af4f1af..ac1e22e2 100644
Binary files a/playwright/src/test/resources/expectations/hide-should-work-firefox.png and b/playwright/src/test/resources/expectations/hide-should-work-firefox.png differ
diff --git a/playwright/src/test/resources/expectations/remove-should-work-firefox.png b/playwright/src/test/resources/expectations/remove-should-work-firefox.png
index cbae7f34..e4ee20d9 100644
Binary files a/playwright/src/test/resources/expectations/remove-should-work-firefox.png and b/playwright/src/test/resources/expectations/remove-should-work-firefox.png differ