From 847dc03c23210877959cca5d5f5123500bfec78a Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Fri, 23 Oct 2026 13:51:10 -0700
Subject: [PATCH 1/2] test(fixtures): inject Playwright objects through JUnit 5
 fixtures

Replace the TestBase base class and @UsePlaywright with a fixture layer
in com.microsoft.playwright.fixtures modeled on upstream browserTest.ts:

- @PlaywrightTest runs each test once per browser (BROWSER env selects)
- Playwright, Browser, BrowserContext, Page, Server etc. are injected as
  method parameters and created lazily, each test in a new context
- @Fixture methods add or override fixtures (test or worker scope)
- worker-scoped objects live in a pool so tests run in parallel without
  sharing Playwright objects across threads
- @DisabledOnBrowser/@EnabledOnBrowser replace @DisabledIf conditions
- @Nested @ParameterizedClass runs a test with different context options

Claude-Session: https://claude.ai/code/session_018p7xPf3r5VjAM7V46nzFTM
---
 CONTRIBUTING.md                               |  40 ++
 .../microsoft/playwright/BrowserServer.java   |  81 ++++
 .../com/microsoft/playwright/HttpsServer.java |  28 ++
 .../java/com/microsoft/playwright/Server.java |  41 +-
 .../ServerWithClientCertificate.java          |   9 +-
 .../playwright/TestAPIResponseAssertions.java |  16 +-
 .../TestAssertThatIsInViewport.java           |  14 +-
 .../microsoft/playwright/TestAutoClose.java   |  10 +-
 .../com/microsoft/playwright/TestBase.java    | 190 --------
 .../playwright/TestBeforeunload.java          |   8 +-
 .../microsoft/playwright/TestBrowser1.java    |  26 +-
 .../microsoft/playwright/TestBrowser2.java    |  73 ++-
 .../microsoft/playwright/TestBrowserBind.java |  12 +-
 .../TestBrowserContextAddCookies.java         |  68 ++-
 .../playwright/TestBrowserContextBaseUrl.java |  18 +-
 .../playwright/TestBrowserContextBasic.java   |  63 ++-
 .../TestBrowserContextCDPSession.java         |  53 +-
 .../TestBrowserContextClearCookies.java       |  20 +-
 .../playwright/TestBrowserContextCookies.java |  76 ++-
 .../TestBrowserContextCredentials.java        |  73 +--
 .../playwright/TestBrowserContextEvents.java  |  96 ++--
 .../TestBrowserContextExposeFunction.java     |  20 +-
 .../playwright/TestBrowserContextFetch.java   | 330 ++++++-------
 .../playwright/TestBrowserContextHar.java     | 123 ++---
 .../playwright/TestBrowserContextLocale.java  |  40 +-
 .../TestBrowserContextNetworkEvents.java      |  32 +-
 .../playwright/TestBrowserContextProxy.java   |  43 +-
 .../playwright/TestBrowserContextRoute.java   |  60 +--
 ...TestBrowserContextServiceWorkerPolicy.java |  12 +-
 .../TestBrowserContextStorageState.java       |  50 +-
 .../playwright/TestBrowserContextStrict.java  |  23 +-
 .../TestBrowserContextViewport.java           |  40 +-
 .../TestBrowserContextWebAuthn.java           |  24 +-
 .../playwright/TestBrowserTypeBasic.java      |  35 +-
 .../playwright/TestBrowserTypeConnect.java    | 195 +++-----
 .../com/microsoft/playwright/TestCheck.java   |  40 +-
 .../microsoft/playwright/TestChromium.java    |  43 +-
 .../playwright/TestChromiumTracing.java       |  37 +-
 .../com/microsoft/playwright/TestClick.java   | 181 +++----
 .../playwright/TestClientCertificates.java    |  80 ++-
 .../microsoft/playwright/TestDebugger.java    |  20 +-
 .../TestDefaultBrowserContext2.java           | 121 ++---
 .../com/microsoft/playwright/TestDialog.java  |  42 +-
 .../playwright/TestDispatchEvent.java         |  47 +-
 .../microsoft/playwright/TestDownload.java    | 114 ++---
 .../TestElementHandleBoundingBox.java         |  43 +-
 .../playwright/TestElementHandleClick.java    |  40 +-
 .../TestElementHandleContentFrame.java        |  24 +-
 .../TestElementHandleConvenience.java         |  68 +--
 .../playwright/TestElementHandleMisc.java     |  48 +-
 .../TestElementHandleOwnerFrame.java          |  34 +-
 .../playwright/TestElementHandlePress.java    |  28 +-
 .../TestElementHandleQuerySelector.java       |  32 +-
 .../TestElementHandleSelectText.java          |  25 +-
 .../playwright/TestElementHandleType.java     |  28 +-
 .../TestElementHandleWaitForElementState.java |  57 ++-
 .../playwright/TestEvalOnSelector.java        | 108 ++---
 .../playwright/TestEvalOnSelectorAll.java     |  36 +-
 .../microsoft/playwright/TestExpectMisc.java  |  12 +-
 .../playwright/TestFirefoxLauncher.java       |  51 +-
 .../playwright/TestFrameNavigate.java         |  12 +-
 .../microsoft/playwright/TestGeolocation.java |  32 +-
 .../microsoft/playwright/TestGlobalFetch.java | 200 ++++----
 .../com/microsoft/playwright/TestHar.java     |  91 ++--
 .../TestJavaSourceLocationInConstructor.java  |  14 +-
 .../playwright/TestLocatorAnyFrame.java       |  80 +--
 .../playwright/TestLocatorAssertions.java     | 457 +++++++++---------
 .../playwright/TestLocatorAssertions2.java    |  84 ++--
 .../playwright/TestLocatorClick.java          |  36 +-
 .../playwright/TestLocatorConvenience.java    |  84 ++--
 .../playwright/TestLocatorElementHandle.java  |  24 +-
 .../playwright/TestLocatorEvaluate.java       |  24 +-
 .../playwright/TestLocatorFrame.java          |  80 +--
 .../playwright/TestLocatorHighlight.java      |  12 +-
 .../microsoft/playwright/TestLocatorList.java |   8 +-
 .../microsoft/playwright/TestLocatorMisc.java |  68 +--
 .../playwright/TestNetworkPostData.java       |  16 +-
 .../playwright/TestNetworkRequest.java        |  97 ++--
 .../playwright/TestNetworkResponse.java       |  40 +-
 .../playwright/TestOptionsFactories.java      |  69 ---
 .../playwright/TestPageAddLocatorHandler.java |  52 +-
 .../playwright/TestPageAddScriptTag.java      |  13 +-
 .../playwright/TestPageAriaSnapshot.java      |  62 ++-
 .../playwright/TestPageAriaSnapshotAI.java    |  32 +-
 .../playwright/TestPageAssertions.java        |  64 +--
 .../playwright/TestPageAutowaitingBasic.java  |  16 +-
 .../microsoft/playwright/TestPageBasic.java   | 154 +++---
 .../microsoft/playwright/TestPageCheck.java   |  20 +-
 .../microsoft/playwright/TestPageClock.java   |  94 ++--
 .../microsoft/playwright/TestPageDialog.java  |  56 +--
 .../microsoft/playwright/TestPageDrag.java    |  36 +-
 .../microsoft/playwright/TestPageDrop.java    |  42 +-
 .../playwright/TestPageEmulateMedia.java      |  46 +-
 .../playwright/TestPageEvaluate.java          | 311 ++++++------
 .../playwright/TestPageEventConsole.java      |  68 +--
 .../playwright/TestPageEventNetwork.java      |  44 +-
 .../playwright/TestPageEventPageError.java    |  12 +-
 .../playwright/TestPageEventPopup.java        |   8 +-
 .../playwright/TestPageEventRequest.java      |   8 +-
 .../playwright/TestPageExposeFunction.java    |  52 +-
 .../microsoft/playwright/TestPageFill.java    | 116 ++---
 .../playwright/TestPageInterception.java      | 193 ++++----
 .../playwright/TestPageKeyboard.java          | 156 +++---
 .../TestPageLocatorConvenience.java           |   8 +-
 .../playwright/TestPageLocatorQuery.java      |  92 ++--
 .../playwright/TestPageNavigate.java          |  75 +--
 .../playwright/TestPageNetworkRequest.java    |  39 +-
 .../playwright/TestPageNetworkResponse.java   |  28 +-
 .../playwright/TestPageNetworkSizes.java      |  24 +-
 .../playwright/TestPageRequestContinue.java   |  31 +-
 .../playwright/TestPageRequestFallback.java   |  56 +--
 .../playwright/TestPageRequestFulfill.java    |  16 +-
 .../playwright/TestPageRequestIntercept.java  |   8 +-
 .../microsoft/playwright/TestPageRoute.java   | 198 ++++----
 .../playwright/TestPageScreenshot.java        | 110 +++--
 .../playwright/TestPageSelectOption.java      | 103 ++--
 .../playwright/TestPageSetContent.java        |  56 +--
 .../TestPageSetExtraHttpHeaders.java          |  24 +-
 .../playwright/TestPageSetInputFiles.java     | 132 ++---
 .../microsoft/playwright/TestPageStrict.java  |  28 +-
 .../playwright/TestPageWaitForNavigation.java |  72 +--
 .../playwright/TestPageWaitForRequest.java    |  28 +-
 .../playwright/TestPageWaitForResponse.java   |  24 +-
 .../playwright/TestPageWaitForUrl.java        |  44 +-
 .../com/microsoft/playwright/TestPdf.java     |  33 +-
 .../playwright/TestPlaywrightCreate.java      |  10 +-
 .../com/microsoft/playwright/TestPopup.java   |  58 +--
 .../playwright/TestQuerySelector.java         |  68 +--
 .../playwright/TestRequestContinue.java       |  48 +-
 .../playwright/TestRequestFulfill.java        |  43 +-
 .../microsoft/playwright/TestRequestGC.java   |   8 +-
 .../playwright/TestRouteWebSocket.java        | 228 +++++----
 .../microsoft/playwright/TestScreencast.java  |  50 +-
 .../playwright/TestSelectorsCss.java          |  84 ++--
 .../playwright/TestSelectorsGetBy.java        |  66 +--
 .../playwright/TestSelectorsMisc.java         |  24 +-
 .../playwright/TestSelectorsRegister.java     |  24 +-
 .../playwright/TestSelectorsRole.java         |  54 +--
 .../playwright/TestSelectorsText.java         |  12 +-
 .../com/microsoft/playwright/TestTap.java     |  35 +-
 .../com/microsoft/playwright/TestTracing.java | 131 +++--
 .../playwright/TestTracingOverConnect.java    |  39 +-
 .../playwright/TestUnresponsiveDriver.java    |  11 +-
 .../playwright/TestUnrouteBehavior.java       |  12 +-
 .../com/microsoft/playwright/TestVideo.java   |  20 +-
 .../playwright/TestWaitForFunction.java       | 142 +++---
 .../com/microsoft/playwright/TestWebMCP.java  |  71 +--
 .../microsoft/playwright/TestWebSocket.java   |  84 ++--
 .../microsoft/playwright/TestWebStorage.java  |  40 +-
 .../com/microsoft/playwright/TestWheel.java   |  39 +-
 .../com/microsoft/playwright/TestWorkers.java |  80 +--
 .../microsoft/playwright/TraceViewerPage.java |   3 +-
 .../java/com/microsoft/playwright/Utils.java  |  32 ++
 .../fixtures/BrowserInvocation.java           | 124 +++++
 .../playwright/fixtures/BrowserName.java      |  58 +++
 .../playwright/fixtures/BuiltinFixture.java   | 127 +++++
 .../fixtures/DisabledOnBrowser.java           |  55 +++
 .../playwright/fixtures/EnabledOnBrowser.java |  35 ++
 .../microsoft/playwright/fixtures/Env.java    |  82 ++++
 .../playwright/fixtures/Fixture.java          |  55 +++
 .../fixtures/FixtureDefinition.java           |  35 ++
 .../playwright/fixtures/FixtureRegistry.java  | 119 +++++
 .../playwright/fixtures/FixtureResolver.java  |  32 ++
 .../playwright/fixtures/MethodFixture.java    | 102 ++++
 .../fixtures/PlaywrightExtension.java         |  51 ++
 .../playwright/fixtures/PlaywrightTest.java   |  59 +++
 .../microsoft/playwright/fixtures/Scope.java  |  31 ++
 .../fixtures/TestPlaywrightFixtures.java      | 180 +++++++
 .../playwright/fixtures/TestScope.java        | 167 +++++++
 .../fixtures/TestWorkerFixtures.java          |  75 +++
 .../microsoft/playwright/fixtures/Worker.java | 119 +++++
 .../playwright/fixtures/WorkerPool.java       |  92 ++++
 .../playwright/fixtures/package-info.java     |  49 ++
 173 files changed, 6219 insertions(+), 4757 deletions(-)
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/BrowserServer.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/HttpsServer.java
 delete mode 100644 playwright/src/test/java/com/microsoft/playwright/TestBase.java
 delete mode 100644 playwright/src/test/java/com/microsoft/playwright/TestOptionsFactories.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserInvocation.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserName.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/BuiltinFixture.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/DisabledOnBrowser.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/EnabledOnBrowser.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/Env.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/Fixture.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureDefinition.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureRegistry.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureResolver.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/MethodFixture.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightTest.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/Scope.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/TestPlaywrightFixtures.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a54c0547..30eb6d9b4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,13 +47,53 @@ Each driver is assembled from the [`playwright-core`](https://www.npmjs.com/pack
 
 ```bash
 mvn compile
+# Runs every test in Chromium, Firefox and WebKit
 mvn test
+# Selecting browsers
+BROWSER=chromium mvn test
+BROWSER=firefox,webkit mvn test
 # Executing a single test
 BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes#shouldHaveTheCorrectResponseBodySize
 # Executing a single test class
 BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes
 ```
 
+Set `HEADED=1` to watch the browsers and `BROWSER_CHANNEL=chrome` (or `msedge`, ...) to test a stable channel.
+
+### Writing tests
+
+Tests use the fixtures from `playwright/src/test/java/com/microsoft/playwright/fixtures`, modeled after the
+upstream Playwright Test fixtures. A test is a `@PlaywrightTest` method that declares the fixtures it needs
+as parameters; it runs once per selected browser, in a fresh context:
+
+```java
+@PlaywrightTest
+void shouldWork(Page page, Server server) {
+  page.navigate(server.EMPTY_PAGE);
+}
+```
+
+The built-in fixtures are `Playwright`, `BrowserName`, `BrowserType`, `BrowserType.LaunchOptions`, `Browser`,
+`Browser.NewContextOptions`, `BrowserContext`, `Page`, `Server` and `HttpsServer`. Playwright, the browser and
+the test servers are shared by the tests that run one after another on the same thread; the context and the
+page are created for each test and closed afterwards. A test class adds or overrides fixtures with
+`@Fixture` methods, whose parameters are the fixtures they depend on:
+
+```java
+@Fixture
+Browser.NewContextOptions contextOptions() {
+  return new Browser.NewContextOptions().setHasTouch(true);
+}
+
+@Fixture(scope = Scope.WORKER)
+static BrowserType.LaunchOptions launchOptions(BrowserType.LaunchOptions defaults) {
+  return defaults.setArgs(asList("--enable-features=WebMCP"));
+}
+```
+
+Use `@DisabledOnBrowser` / `@EnabledOnBrowser` for browser-specific tests, and a `@Nested @ParameterizedClass`
+with a `@Fixture` method reading its `@Parameter` field to run the same tests with different options.
+
 ### Generating API
 
 Public Java API is generated from api.json, which is generated from the upstream Playwright source at the exact commit that produced the driver version in [scripts/DRIVER_VERSION](scripts/DRIVER_VERSION) (resolved via `npm view playwright@<version> gitHead`). `scripts/generate_api.sh` fetches a minimal upstream checkout automatically; set `PW_SRC_DIR` to reuse an existing `microsoft/playwright` checkout instead. To regenerate Java interfaces for the current driver run:
diff --git a/playwright/src/test/java/com/microsoft/playwright/BrowserServer.java b/playwright/src/test/java/com/microsoft/playwright/BrowserServer.java
new file mode 100644
index 000000000..4e7f4d5d8
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/BrowserServer.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.impl.driver.Driver;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.util.Collections;
+
+import static com.microsoft.playwright.fixtures.Env.isWindows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * A {@code playwright launch-server} process that tests connect to, the counterpart of the
+ * upstream {@code startRemoteServer} fixture.
+ */
+class BrowserServer implements AutoCloseable {
+  final Process process;
+  final String wsEndpoint;
+
+  static BrowserServer launch(BrowserType browserType) {
+    try {
+      Driver driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
+      Path dir = driver.driverDir();
+      String node = dir.resolve(isWindows ? "node.exe" : "node").toString();
+      String cliJs = dir.resolve("package/cli.js").toString();
+      // We launch node process directly instead of using playwright.sh script as killing the script
+      // process will leave node process running and killing it would be more hassle.
+      ProcessBuilder pb = new ProcessBuilder(node, cliJs, "launch-server", "--browser", browserType.name());
+      pb.directory(dir.toFile());
+      pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+      Process process = pb.start();
+      BufferedReader input = new BufferedReader(new InputStreamReader(process.getInputStream()));
+      String wsEndpoint = input.readLine();
+      if (!wsEndpoint.startsWith("ws://")) {
+        throw new RuntimeException("Invalid web socket address: " + wsEndpoint);
+      }
+      return new BrowserServer(process, wsEndpoint);
+    } catch (IOException e) {
+      throw new PlaywrightException("Failed to launch server", e);
+    }
+  }
+
+  private BrowserServer(Process process, String wsEndpoint) {
+    this.process = process;
+    this.wsEndpoint = wsEndpoint;
+  }
+
+  void kill() throws InterruptedException {
+    process.destroy();
+    int exitCode = process.waitFor();
+    // FIXME: 2 tests are failing this check on windows:
+    // disconnectedEventShouldBeEmittedWhenBrowserIsClosedOrServerIsClosed
+    // shouldThrowWhenUsedAfterIsConnectedReturnsFalse
+    if (!isWindows) {
+      assertEquals(0, exitCode);
+    }
+  }
+
+  @Override
+  public void close() {
+    process.destroyForcibly();
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/HttpsServer.java b/playwright/src/test/java/com/microsoft/playwright/HttpsServer.java
new file mode 100644
index 000000000..a8724b30e
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/HttpsServer.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import java.io.IOException;
+
+/**
+ * The HTTPS test server, a distinct type so that it can be injected next to the HTTP {@link Server}.
+ */
+public class HttpsServer extends Server {
+  HttpsServer(int port) throws IOException {
+    super(port, true);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/Server.java b/playwright/src/test/java/com/microsoft/playwright/Server.java
index c8b6838a7..3c1946068 100644
--- a/playwright/src/test/java/com/microsoft/playwright/Server.java
+++ b/playwright/src/test/java/com/microsoft/playwright/Server.java
@@ -53,27 +53,36 @@ private Auth(String user, String password) {
     }
   }
 
+  /** Listens on a port picked by the OS, which parallel tests cannot race for. */
+  public static Server createHttp() throws IOException {
+    return new Server(0, false);
+  }
+
   public static Server createHttp(int port) throws IOException {
     return new Server(port, false);
   }
 
-  static Server createHttps(int port) throws IOException {
-    return new Server(port, true);
+  public static HttpsServer createHttps() throws IOException {
+    return new HttpsServer(0);
   }
 
-  private Server(int port, boolean https) throws IOException {
-    PORT = port;
-    PREFIX = "http" + (https ? "s" : "") + "://localhost:" + PORT;
-    CROSS_PROCESS_PREFIX = "http" + (https ? "s" : "") + "://127.0.0.1:" + PORT;
-    EMPTY_PAGE = PREFIX + "/empty.html";
+  public static HttpsServer createHttps(int port) throws IOException {
+    return new HttpsServer(port);
+  }
 
+  protected Server(int port, boolean https) throws IOException {
     if (https) {
-      HttpsServer httpsServer = HttpsServer.create(new InetSocketAddress("localhost", port), 0);
+      com.sun.net.httpserver.HttpsServer httpsServer = com.sun.net.httpserver.HttpsServer.create(new InetSocketAddress("localhost", port), 0);
       httpsServer.setHttpsConfigurator(HttpsConfiguratorImpl.create());
       server = httpsServer;
     } else {
       server = HttpServer.create(new InetSocketAddress("localhost", port), 0);
     }
+    PORT = server.getAddress().getPort();
+    PREFIX = "http" + (https ? "s" : "") + "://localhost:" + PORT;
+    CROSS_PROCESS_PREFIX = "http" + (https ? "s" : "") + "://127.0.0.1:" + PORT;
+    EMPTY_PAGE = PREFIX + "/empty.html";
+
     server.createContext("/", this);
     server.setExecutor(null); // creates a default executor
     server.start();
@@ -85,19 +94,19 @@ public void stop() {
     server.stop(0);
   }
 
-  void setAuth(String path, String user, String password) {
+  public void setAuth(String path, String user, String password) {
     auths.put(path, new Auth(user, password));
   }
 
-  void setCSP(String path, String csp) {
+  public void setCSP(String path, String csp) {
     this.csp.put(path, csp);
   }
 
-  void enableGzip(String path) {
+  public void enableGzip(String path) {
     gzipRoutes.add(path);
   }
 
-  void setResourceProvider(Function<String, InputStream> resourceProvider) {
+  public void setResourceProvider(Function<String, InputStream> resourceProvider) {
     this.resourceProvider = resourceProvider;
   }
 
@@ -118,7 +127,7 @@ static class Request {
     }
   }
 
-  Future<Request> futureRequest(String path) {
+  public Future<Request> futureRequest(String path) {
     CompletableFuture<Request> future = requestSubscribers.get(path);
     if (future == null) {
       future = new CompletableFuture<>();
@@ -128,11 +137,11 @@ Future<Request> futureRequest(String path) {
   }
 
 
-  void setRoute(String path, HttpHandler handler) {
+  public void setRoute(String path, HttpHandler handler) {
     routes.put(path, handler);
   }
 
-  void setRedirect(String from, String to) {
+  public void setRedirect(String from, String to) {
     setRoute(from, exchange -> {
       exchange.getResponseHeaders().put("location", Arrays.asList(to));
       exchange.sendResponseHeaders(302, -1);
@@ -140,7 +149,7 @@ void setRedirect(String from, String to) {
     });
   }
 
-  void reset() {
+  public void reset() {
     requestSubscribers.clear();
     auths.clear();
     csp.clear();
diff --git a/playwright/src/test/java/com/microsoft/playwright/ServerWithClientCertificate.java b/playwright/src/test/java/com/microsoft/playwright/ServerWithClientCertificate.java
index ed8916e57..974196e34 100644
--- a/playwright/src/test/java/com/microsoft/playwright/ServerWithClientCertificate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/ServerWithClientCertificate.java
@@ -26,7 +26,7 @@
 import java.security.cert.*;
 import java.util.*;
 
-public class ServerWithClientCertificate implements HttpHandler {
+public class ServerWithClientCertificate implements HttpHandler, AutoCloseable {
   private final HttpServer server;
   final String origin;
   final String crossOrigin;
@@ -41,7 +41,7 @@ private ServerWithClientCertificate(int port) throws IOException {
     origin = "https://localhost:" + port;
     crossOrigin = "https://127.0.0.1:" + port;;
     url = origin + "/index.html";
-    HttpsServer httpsServer = HttpsServer.create(new InetSocketAddress("localhost", port), 0);
+    com.sun.net.httpserver.HttpsServer httpsServer = com.sun.net.httpserver.HttpsServer.create(new InetSocketAddress("localhost", port), 0);
     httpsServer.setHttpsConfigurator(new HttpsConfiguratorImpl(loadCertificates()));
     server = httpsServer;
     server.createContext("/", this);
@@ -53,6 +53,11 @@ public void stop() {
     server.stop(0);
   }
 
+  @Override
+  public void close() {
+    stop();
+  }
+
   private SSLContext loadCertificates() {
     try {
       // Create an SSL context
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestAPIResponseAssertions.java b/playwright/src/test/java/com/microsoft/playwright/TestAPIResponseAssertions.java
index 3f124b9e2..e5ed6b2c2 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestAPIResponseAssertions.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestAPIResponseAssertions.java
@@ -16,9 +16,7 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.opentest4j.AssertionFailedError;
 
 import java.io.OutputStreamWriter;
@@ -27,22 +25,20 @@
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestAPIResponseAssertions {
-  @Test
+  @PlaywrightTest
   void passWithResponse(Page page, Server server) {
     APIResponse res = page.request().get(server.EMPTY_PAGE);
     assertThat(res).isOK();
   }
 
-  @Test
+  @PlaywrightTest
   void passWithNot(Page page, Server server) {
     APIResponse res = page.request().get(server.PREFIX + "/unknown");
     assertThat(res).not().isOK();
   }
 
-  @Test
+  @PlaywrightTest
   void fail(Page page, Server server) {
     APIResponse res = page.request().get(server.PREFIX + "/unknown");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> assertThat(res).isOK());
@@ -50,14 +46,14 @@ void fail(Page page, Server server) {
     assertTrue(e.getMessage().contains("← 404 Not Found"), "Actual error: " + e.toString());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldPrintResponseTextIfIdOkFails(Page page, Server server) {
     APIResponse res = page.request().get(server.PREFIX + "/unknown");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> assertThat(res).isOK());
     assertTrue(e.getMessage().contains("File not found"), "Actual error: " + e.toString());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldOnlyPrintResponseWithTextContentTypeIfIsOkFails(Page page, Server server) {
     {
       server.setRoute("/text-content-type", exchange -> {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestAssertThatIsInViewport.java b/playwright/src/test/java/com/microsoft/playwright/TestAssertThatIsInViewport.java
index b2b0e56d0..cb631f72f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestAssertThatIsInViewport.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestAssertThatIsInViewport.java
@@ -17,19 +17,15 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.LocatorAssertions;
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.opentest4j.AssertionFailedError;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 // Copied from expect-misc.spec.ts > toBeInViewport
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestAssertThatIsInViewport {
-  @Test
+  @PlaywrightTest
   void shouldWork(Page page) {
     page.setContent("<div id=big style=\"height: 10000px;\"></div>\n" +
       "      <div id=small>foo</div>");
@@ -40,7 +36,7 @@ void shouldWork(Page page) {
     assertThat(page.locator("#small")).isInViewport(new LocatorAssertions.IsInViewportOptions().setRatio(1));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldRespectRatioOption(Page page) {
     page.setContent("<style>body, div, html { padding: 0; margin: 0; }</style>\n" +
       "      <div id=big style=\"height: 400vh;\"></div>");
@@ -58,14 +54,14 @@ void shouldRespectRatioOption(Page page) {
     assertThat(page.locator("div")).not().isInViewport(new LocatorAssertions.IsInViewportOptions().setRatio(0.8));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldHaveGoodStack(Page page) {
     AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> assertThat(page.locator("body")).not().isInViewport(new LocatorAssertions.IsInViewportOptions().setTimeout(100)));
     assertNotNull(error);
     assertTrue(error.getMessage().contains("Locator expected not to be in viewport"), error.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldReportIntersectionEvenIfFullyCoveredByOtherElement(Page page) {
     page.setContent("<h1>hello</h1>\n" +
       "      <div style=\"position: relative; height: 10000px; top: -5000px;></div>");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestAutoClose.java b/playwright/src/test/java/com/microsoft/playwright/TestAutoClose.java
index 8521bf3ee..179abe5e0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestAutoClose.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestAutoClose.java
@@ -16,7 +16,9 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -24,10 +26,10 @@
  * This test simply makes sure that all 4 main interfaces implement AutoCloseable. If it compiles, then it passes.
  */
 public class TestAutoClose {
-  @Test
-  void shouldAllowUsingTryWithResources() {
+  @PlaywrightTest
+  void shouldAllowUsingTryWithResources(BrowserName browserName) {
     try (Playwright playwright = Playwright.create();
-         Browser browser = Utils.getBrowserTypeFromEnv(playwright).launch();
+         Browser browser = browserName.browserType(playwright).launch(Env.launchOptions());
          BrowserContext context = browser.newContext();
          Page page = context.newPage()) {
       assertEquals(2021, page.evaluate("() => 2021"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBase.java b/playwright/src/test/java/com/microsoft/playwright/TestBase.java
deleted file mode 100644
index 9d3981f74..000000000
--- a/playwright/src/test/java/com/microsoft/playwright/TestBase.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright;
-
-import org.junit.jupiter.api.*;
-
-import com.microsoft.playwright.options.SameSiteAttribute;
-
-import javax.sql.rowset.Predicate;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.Provider;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-import static com.microsoft.playwright.Utils.getBrowserNameFromEnv;
-import static com.microsoft.playwright.Utils.nextFreePort;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class TestBase {
-  // Fields reset once before all tests in a class.
-  Server server;
-  Server httpsServer;
-  BrowserType browserType;
-  Playwright playwright;
-  Browser browser;
-
-  static final boolean isMac = Utils.getOS() == Utils.OS.MAC;
-  static final boolean isLinux = Utils.getOS() == Utils.OS.LINUX;
-  static final boolean isWindows = Utils.getOS() == Utils.OS.WINDOWS;
-  static final boolean headed;
-  static final SameSiteAttribute defaultSameSiteCookieValue;
-
-  static {
-    String headedEnv = System.getenv("HEADED");
-    headed = headedEnv != null && !"0".equals(headedEnv) && !"false".equals(headedEnv);
-    defaultSameSiteCookieValue = initSameSiteAttribute();
-  }
-
-  // Fields reset before each test.
-  Page page;
-  BrowserContext context;
-
-  static boolean isHeaded() {
-    return headed;
-  }
-
-  static boolean isChromium() {
-    return "chromium".equals(getBrowserNameFromEnv());
-  }
-
-  static boolean isWebKit() {
-    return "webkit".equals(getBrowserNameFromEnv());
-  }
-
-  static boolean isFirefox() {
-    return "firefox".equals(getBrowserNameFromEnv());
-  }
-
-  static String getBrowserChannelFromEnv() {
-    return System.getenv("BROWSER_CHANNEL");
-  }
-
-  static BrowserType.LaunchOptions createLaunchOptions() {
-    BrowserType.LaunchOptions options;
-    options = new BrowserType.LaunchOptions();
-    options.headless = !headed;
-    options.channel = getBrowserChannelFromEnv();
-    return options;
-  }
-
-  Playwright.CreateOptions playwrightOptions() {
-    return null;
-  }
-
-  void initBrowserType() {
-    playwright = Playwright.create(playwrightOptions());
-    browserType = Utils.getBrowserTypeFromEnv(playwright);
-  }
-
-  void launchBrowser(BrowserType.LaunchOptions launchOptions) {
-    initBrowserType();
-    browser = browserType.launch(launchOptions);
-  }
-
-  @BeforeAll
-  void launchBrowser() {
-    launchBrowser(createLaunchOptions());
-  }
-
-  @AfterAll
-  void closeBrowser() {
-    if (browser != null) {
-      browser.close();
-      browser = null;
-    }
-  }
-
-  @BeforeAll
-  void startServer() throws IOException {
-    server = Server.createHttp(nextFreePort());
-    httpsServer = Server.createHttps(nextFreePort());
-  }
-
-  @AfterAll
-  void stopServer() {
-    if (server != null) {
-      server.stop();
-      server = null;
-    }
-    if (httpsServer != null) {
-      httpsServer.stop();
-      httpsServer = null;
-    }
-  }
-
-  @AfterAll
-  void closePlaywright() {
-    if (playwright != null) {
-      playwright.close();
-      playwright = null;
-    }
-  }
-
-  BrowserContext createContext() {
-    return browser.newContext();
-  }
-
-  @BeforeEach
-  void createContextAndPage() {
-    server.reset();
-    httpsServer.reset();
-    context = createContext();
-    page = context.newPage();
-  }
-
-  @AfterEach
-  void closeContext() {
-    if (context != null) {
-      context.close();
-      context = null;
-      page = null;
-    }
-  }
-
-  void waitForCondition(BooleanSupplier predicate) {
-    waitForCondition(predicate, 5_000);
-  }
-
-  void waitForCondition(BooleanSupplier predicate, int timeoutMs) {
-    page.waitForCondition(predicate, new Page.WaitForConditionOptions().setTimeout(timeoutMs));
-  }
-
-  private static SameSiteAttribute initSameSiteAttribute() {
-    if (isChromium()) return SameSiteAttribute.LAX;
-    if (isWebKit() && isLinux) return SameSiteAttribute.LAX;
-    if (isWebKit() && !isLinux) return SameSiteAttribute.NONE;
-    // for firefox version >= 103 'None' is used.
-    return SameSiteAttribute.NONE;
-  }
-
-  static boolean chromiumVersionLessThan(String a, String b) {
-    String[] aParts = a.split("\\.");
-    String[] bParts = b.split("\\.");
-    for (int i = 0; i < 4; i++) {
-      int aPart = Integer.parseInt(aParts[i]);
-      int bPart = Integer.parseInt(bParts[i]);
-      if (aPart > bPart) return false;
-      if (aPart < bPart) return true;
-    }
-    return false;
-  }
-}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBeforeunload.java b/playwright/src/test/java/com/microsoft/playwright/TestBeforeunload.java
index 112b49ac0..4d858c21f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBeforeunload.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBeforeunload.java
@@ -16,14 +16,10 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestBeforeunload {
-  @Test
+  @PlaywrightTest
   void shouldBeAbleToNavigateAwayFromPageWithBeforeunload(Page page, Server server) {
     page.navigate(server.PREFIX + "/beforeunload.html");
     // We have to interact with a page so that "beforeunload" handlers
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java
index 4d3ef7203..1ae59b41e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowser1.java
@@ -18,23 +18,20 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
 
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 @Tag("smoke")
 public class TestBrowser1 {
 
-  @Test
+  @PlaywrightTest
   void shouldCreateNewPage(Browser browser) {
     Page page1 = browser.newPage();
     assertEquals(1, browser.contexts().size());
@@ -49,7 +46,7 @@ void shouldCreateNewPage(Browser browser) {
     assertEquals(0, browser.contexts().size());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldThrowUponSecondCreateNewPage(Browser browser) {
     Page page = browser.newPage();
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.context().newPage());
@@ -57,7 +54,7 @@ void shouldThrowUponSecondCreateNewPage(Browser browser) {
     page.close();
   }
 
-  @Test
+  @PlaywrightTest
   void versionShouldWork(Browser browser) {
     switch (browser.browserType().name()) {
       case "chromium":
@@ -75,14 +72,13 @@ void versionShouldWork(Browser browser) {
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldReturnBrowserType(BrowserType browserType, Browser browser) {
     assertEquals(browserType, browser.browserType());
   }
 
-  @Test
-  @EnabledIf(value = "com.microsoft.playwright.TestOptionsFactories#isChromium",
-             disabledReason = "Chrome Devtools Protocol supported by chromium only")
+  @PlaywrightTest
+  @EnabledOnBrowser(value = CHROMIUM, reason = "Chrome Devtools Protocol supported by chromium only")
   void shouldWorkWithNewBrowserCDPSession(Browser browser) {
     CDPSession session = browser.newBrowserCDPSession();
 
@@ -106,7 +102,7 @@ void shouldWorkWithNewBrowserCDPSession(Browser browser) {
     session.detach();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldPropagateCloseReasonToPendingActions(Browser browser) {
     BrowserContext context = browser.newContext();
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.waitForPage(() -> {
@@ -115,7 +111,7 @@ void shouldPropagateCloseReasonToPendingActions(Browser browser) {
     assertTrue(e.getMessage().contains("The reason."), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldFireContextEvent(Browser browser) {
     BrowserContext[] contextEvent = { null };
     browser.onContext(c -> contextEvent[0] = c);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowser2.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowser2.java
index f82fadd4e..989960f4b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowser2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowser2.java
@@ -16,66 +16,47 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.Options;
-import com.microsoft.playwright.junit.OptionsFactory;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BrowserChannel;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
 
-import static com.microsoft.playwright.TestBrowser2.ChannelOptionsFactory.getBrowserChannelEnumFromEnv;
-import static com.microsoft.playwright.TestOptionsFactories.createLaunchOptions;
-import static com.microsoft.playwright.TestOptionsFactories.getBrowserChannelFromEnv;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@FixtureTest
-@UsePlaywright(TestBrowser2.ChannelOptionsFactory.class)
 public class TestBrowser2 {
 
-  public static class ChannelOptionsFactory implements OptionsFactory {
-    @Override
-    public Options getOptions() {
-      BrowserChannel channel = getBrowserChannelEnumFromEnv();
-
-      BrowserType.LaunchOptions launchOptions = createLaunchOptions();
-      launchOptions.channel = channel;
-      return new Options().setLaunchOptions(launchOptions);
+  private static BrowserChannel getBrowserChannelEnumFromEnv() {
+    String channel = Env.channel();
+    if (channel == null) {
+      return null;
     }
-
-    public static BrowserChannel getBrowserChannelEnumFromEnv() {
-      String channel = getBrowserChannelFromEnv();
-      if (channel == null) {
-        return null;
-      }
-      switch (channel) {
-        case "chrome":
-          return BrowserChannel.CHROME;
-        case "chrome-beta":
-          return BrowserChannel.CHROME_BETA;
-        case "chrome-dev":
-          return BrowserChannel.CHROME_DEV;
-        case "chrome-canary":
-          return BrowserChannel.CHROME_CANARY;
-        case "msedge":
-          return BrowserChannel.MSEDGE;
-        case "msedge-beta":
-          return BrowserChannel.MSEDGE_BETA;
-        case "msedge-dev":
-          return BrowserChannel.MSEDGE_DEV;
-        case "msedge-canary":
-          return BrowserChannel.MSEDGE_CANARY;
-        default:
-          throw new IllegalArgumentException("Unknown BROWSER_CHANNEL " + channel);
-      }
+    switch (channel) {
+      case "chrome":
+        return BrowserChannel.CHROME;
+      case "chrome-beta":
+        return BrowserChannel.CHROME_BETA;
+      case "chrome-dev":
+        return BrowserChannel.CHROME_DEV;
+      case "chrome-canary":
+        return BrowserChannel.CHROME_CANARY;
+      case "msedge":
+        return BrowserChannel.MSEDGE;
+      case "msedge-beta":
+        return BrowserChannel.MSEDGE_BETA;
+      case "msedge-dev":
+        return BrowserChannel.MSEDGE_DEV;
+      case "msedge-canary":
+        return BrowserChannel.MSEDGE_CANARY;
+      default:
+        throw new IllegalArgumentException("Unknown BROWSER_CHANNEL " + channel);
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSupportDeprecatedChannelEnum(BrowserType browserType) {
     BrowserChannel channel = getBrowserChannelEnumFromEnv();
     Assumptions.assumeTrue(channel != null);
-    BrowserType.LaunchOptions options = createLaunchOptions();
+    BrowserType.LaunchOptions options = Env.launchOptions();
     options.setChannel(channel);
     Browser browser = browserType.launch(options);
     assertNotNull(browser);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java
index b849293ed..e6a7e5e9c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserBind.java
@@ -16,14 +16,14 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BindResult;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserBind extends TestBase {
-  @Test
-  void shouldBindAndUnbindBrowser() {
+public class TestBrowserBind {
+  @PlaywrightTest
+  void shouldBindAndUnbindBrowser(Browser browser) {
     BindResult serverInfo = browser.bind("default");
     try {
       assertNotNull(serverInfo);
@@ -34,8 +34,8 @@ void shouldBindAndUnbindBrowser() {
     }
   }
 
-  @Test
-  void shouldBindWithCustomTitleAndOptions() {
+  @PlaywrightTest
+  void shouldBindWithCustomTitleAndOptions(Browser browser) {
     BindResult serverInfo = browser.bind("my-title",
       new Browser.BindOptions().setHost("127.0.0.1").setPort(0));
     try {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java
index 1bc1fe15b..76ddcc2e6 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java
@@ -16,27 +16,24 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Cookie;
-import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import static com.microsoft.playwright.TestBase.defaultSameSiteCookieValue;
-import static com.microsoft.playwright.TestOptionsFactories.isFirefox;
 import static com.microsoft.playwright.Utils.assertJsonEquals;
+import static com.microsoft.playwright.Utils.defaultSameSiteCookieValue;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestBrowserContextAddCookies {
-  @Test
+  @PlaywrightTest
   void shouldWork(Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     context.addCookies(asList(
@@ -52,7 +49,7 @@ private static List<Cookie> normalizeExpires(List<Cookie> cookies) {
     return cookies;
   }
 
-  @Test
+  @PlaywrightTest
   void shouldRoundtripCookie(Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     // @see https://en.wikipedia.org/wiki/Year_2038_problem
@@ -70,7 +67,7 @@ void shouldRoundtripCookie(Page page, Server server, BrowserContext context) {
     assertJsonEquals(normalizeExpires(cookies), normalizeExpires(context.cookies()));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSendCookieHeader(Server server, BrowserContext context) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/empty.html");
     context.addCookies(asList(
@@ -81,7 +78,7 @@ void shouldSendCookieHeader(Server server, BrowserContext context) throws Execut
     assertEquals(singletonList("cookie=value"), cookies);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIsolateCookiesInBrowserContexts(Browser browser, BrowserContext context, Server server) {
     BrowserContext anotherContext = browser.newContext();
     context.addCookies(asList(
@@ -99,7 +96,7 @@ void shouldIsolateCookiesInBrowserContexts(Browser browser, BrowserContext conte
     anotherContext.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIsolateSessionCookies(Server server, BrowserContext context, Browser browser) {
     server.setRoute("/setcookie.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "session=value");
@@ -127,7 +124,7 @@ void shouldIsolateSessionCookies(Server server, BrowserContext context, Browser
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIsolatePersistentCookies(Server server, BrowserContext context, Browser browser) {
     server.setRoute("/setcookie.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "persistent=persistent-value; max-age=3600");
@@ -152,7 +149,7 @@ void shouldIsolatePersistentCookies(Server server, BrowserContext context, Brows
     context2.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIsolateSendCookieHeader(BrowserContext context, Server server, Browser browser) throws ExecutionException, InterruptedException {
     context.addCookies(asList(
       new Cookie("sendcookie", "value").setUrl(server.EMPTY_PAGE)));
@@ -173,11 +170,10 @@ void shouldIsolateSendCookieHeader(BrowserContext context, Server server, Browse
       newContext.close();
     }
   }
-  @Test
-  void shouldIsolateCookiesBetweenLaunches(Playwright playwright, Server server) {
+  @PlaywrightTest
+  void shouldIsolateCookiesBetweenLaunches(BrowserType browserType, Server server) {
 //    test.slow();
 // TODO:  const browser1 = browserType.launch(browserOptions);
-    BrowserType browserType = Utils.getBrowserTypeFromEnv(playwright);
     Browser browser1 = browserType.launch();
     BrowserContext context1 = browser1.newContext();
     context1.addCookies(asList(new Cookie("cookie-in-context-1", "value")
@@ -193,7 +189,7 @@ void shouldIsolateCookiesBetweenLaunches(Playwright playwright, Server server) {
     browser2.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSetMultipleCookies(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     context.addCookies(asList(
@@ -206,7 +202,7 @@ void shouldSetMultipleCookies(Page page, BrowserContext context, Server server)
       "}"));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldHaveExpiresSetTo1ForSessionCookies(BrowserContext context, Server server) {
     context.addCookies(asList(
       new Cookie("expires", "123456").setUrl(server.EMPTY_PAGE)));
@@ -214,8 +210,8 @@ void shouldHaveExpiresSetTo1ForSessionCookies(BrowserContext context, Server ser
     assertEquals(-1, cookies.get(0).expires);
   }
 
-  @Test
-  void shouldSetCookieWithReasonableDefaults(BrowserContext context, Server server) {
+  @PlaywrightTest
+  void shouldSetCookieWithReasonableDefaults(BrowserName browserName, BrowserContext context, Server server) {
     context.addCookies(asList(
       new Cookie("defaults", "123456").setUrl(server.EMPTY_PAGE)));
     List<Cookie> cookies = context.cookies();
@@ -227,12 +223,12 @@ void shouldSetCookieWithReasonableDefaults(BrowserContext context, Server server
       "  expires: -1,\n" +
       "  httpOnly: false,\n" +
       "  secure: false,\n" +
-      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "}]", cookies);
   }
 
-  @Test
-  void shouldSetACookieWithAPath(Page page, Server server, BrowserContext context) {
+  @PlaywrightTest
+  void shouldSetACookieWithAPath(BrowserName browserName, Page page, Server server, BrowserContext context) {
     page.navigate(server.PREFIX + "/grid.html");
     context.addCookies(asList(new Cookie("gridcookie", "GRID")
       .setDomain("localhost")
@@ -246,7 +242,7 @@ void shouldSetACookieWithAPath(Page page, Server server, BrowserContext context)
       "  expires: -1,\n" +
       "  httpOnly: false,\n" +
       "  secure: false,\n" +
-      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "}]", cookies);
     assertEquals("gridcookie=GRID", page.evaluate("document.cookie"));
     page.navigate(server.EMPTY_PAGE);
@@ -255,7 +251,7 @@ void shouldSetACookieWithAPath(Page page, Server server, BrowserContext context)
     assertEquals("gridcookie=GRID", page.evaluate("document.cookie"));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotSetACookieWithBlankPageURL(BrowserContext context, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () ->  context.addCookies(asList(
       new Cookie("example-cookie", "best").setUrl(server.EMPTY_PAGE),
@@ -264,7 +260,7 @@ void shouldNotSetACookieWithBlankPageURL(BrowserContext context, Server server)
     assertTrue(e.getMessage().contains("Blank page can not have cookie \"example-cookie-blank\""));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotSetACookieOnADataURLPage(BrowserContext context) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.addCookies(asList(
       new Cookie("example-cookie", "best").setUrl("data:,Hello%2C%20World!")
@@ -272,7 +268,7 @@ void shouldNotSetACookieOnADataURLPage(BrowserContext context) {
     assertTrue(e.getMessage().contains("Data URL page can not have cookie \"example-cookie\""));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldDefaultToSettingSecureCookieForHTTPSWebsites(Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     String SECURE_URL = "https://example.com";
@@ -284,7 +280,7 @@ void shouldDefaultToSettingSecureCookieForHTTPSWebsites(Page page, Server server
     assertTrue(cookies.get(0).secure);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldBeAbleToSetUnsecureCookieForHTTPWebsite(Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     String HTTP_URL = "http://example.com";
@@ -296,8 +292,8 @@ void shouldBeAbleToSetUnsecureCookieForHTTPWebsite(Page page, Server server, Bro
     assertFalse(cookies.get(0).secure);
   }
 
-  @Test
-  void shouldSetACookieOnADifferentDomain(Page page, Server server, BrowserContext context) {
+  @PlaywrightTest
+  void shouldSetACookieOnADifferentDomain(BrowserName browserName, Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     context.addCookies(asList(
       new Cookie("example-cookie", "best").setUrl("https://www.example.com")
@@ -311,11 +307,11 @@ void shouldSetACookieOnADifferentDomain(Page page, Server server, BrowserContext
       "  expires: -1,\n" +
       "  httpOnly: false,\n" +
       "  secure: true,\n" +
-      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "}]", context.cookies("https://www.example.com"));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSetCookiesForAFrame(Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     context.addCookies(asList(
@@ -333,8 +329,8 @@ void shouldSetCookiesForAFrame(Page page, Server server, BrowserContext context)
     assertEquals("frame-cookie=value", page.frames().get(1).evaluate("document.cookie"));
   }
 
-  @Test
-  void shouldNotBlockThirdPartyCookies(Page page, Server server, BrowserContext context) {
+  @PlaywrightTest
+  void shouldNotBlockThirdPartyCookies(BrowserName browserName, Page page, Server server, BrowserContext context) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("src => {\n" +
       "  let fulfill;\n" +
@@ -347,7 +343,7 @@ void shouldNotBlockThirdPartyCookies(Page page, Server server, BrowserContext co
       "}", server.CROSS_PROCESS_PREFIX + "/grid.html");
     page.frames().get(1).evaluate("document.cookie = 'username=John Doe'");
     page.waitForTimeout(2000);
-    boolean allowsThirdParty = isFirefox();
+    boolean allowsThirdParty = browserName == FIREFOX;
     List<Cookie> cookies = context.cookies(server.CROSS_PROCESS_PREFIX + "/grid.html");
     if (allowsThirdParty) {
       assertJsonEquals("[{\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBaseUrl.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBaseUrl.java
index 91e127df1..32b2b8c5e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBaseUrl.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBaseUrl.java
@@ -16,19 +16,15 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.net.MalformedURLException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestBrowserContextBaseUrl {
-  @Test
+  @PlaywrightTest
   void shouldConstructANewURLWhenABaseURLInBrowserNewContextIsPassedToPageGoto(Browser browser, Server server) {
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setBaseURL(server.PREFIX))) {
       Page page = context.newPage();
@@ -36,13 +32,13 @@ void shouldConstructANewURLWhenABaseURLInBrowserNewContextIsPassedToPageGoto(Bro
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldConstructANewURLWhenABaseURLInBrowserNewPageIsPassedToPageGoto(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setBaseURL(server.PREFIX))) {
       assertEquals(server.EMPTY_PAGE, page.navigate("/empty.html").url());
     }
   }
-  @Test
+  @PlaywrightTest
   void shouldConstructTheURLsCorrectlyWhenABaseURLWithoutATrailingSlashInBrowserNewPageIsPassedToPageGoto(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setBaseURL(server.PREFIX + "/url-construction"))) {
       assertEquals(server.PREFIX + "/mypage.html", page.navigate("mypage.html").url());
@@ -51,7 +47,7 @@ void shouldConstructTheURLsCorrectlyWhenABaseURLWithoutATrailingSlashInBrowserNe
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldConstructTheURLsCorrectlyWhenABaseURLWithATrailingSlashInBrowserNewPageIsPassedToPageGoto(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setBaseURL(server.PREFIX + "/url-construction/"))) {
       assertEquals(server.PREFIX + "/url-construction/mypage.html", page.navigate("mypage.html").url());
@@ -62,7 +58,7 @@ void shouldConstructTheURLsCorrectlyWhenABaseURLWithATrailingSlashInBrowserNewPa
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotConstructANewURLWhenValidURLsArePassed(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setBaseURL("http://microsoft.com"))) {
       assertEquals(server.EMPTY_PAGE, page.navigate(server.EMPTY_PAGE).url());
@@ -75,7 +71,7 @@ void shouldNotConstructANewURLWhenValidURLsArePassed(Browser browser, Server ser
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldBeAbleToMatchAURLRelativeToItsGivenURLWithUrlMatcher(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setBaseURL(server.PREFIX + "/foobar/"))) {
       page.navigate("/kek/index.html");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
index f78dd8703..f0b7f9c07 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
@@ -16,26 +16,23 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.microsoft.playwright.TestOptionsFactories.isFirefox;
-import static com.microsoft.playwright.TestOptionsFactories.isWebKit;
 import static com.microsoft.playwright.Utils.verifyViewport;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 @Tag("smoke")
 public class TestBrowserContextBasic {
-  @Test
+  @PlaywrightTest
   void shouldCreateNewContext(Browser browser) {
     assertEquals(0, browser.contexts().size());
     BrowserContext context = browser.newContext();
@@ -47,7 +44,7 @@ void shouldCreateNewContext(Browser browser) {
     assertEquals(context.browser(), browser);
   }
 
-  @Test
+  @PlaywrightTest
   void windowOpenShouldUseParentTabContext(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
@@ -57,7 +54,7 @@ void windowOpenShouldUseParentTabContext(Browser browser, Server server) {
     context.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIsolateLocalStorageAndCookies(Browser browser, Server server) {
     // Create two incognito contexts.
     BrowserContext context1 = browser.newContext();
@@ -102,7 +99,7 @@ void shouldIsolateLocalStorageAndCookies(Browser browser, Server server) {
     assertEquals(0, browser.contexts().size());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldPropagateDefaultViewportToThePage(Browser browser) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setViewportSize(456, 789));
     Page page = context.newPage();
@@ -114,7 +111,7 @@ void shouldMakeACopyOfDefaultViewport() {
     // Doesn't make sense in Java.
   }
 
-  @Test
+  @PlaywrightTest
   void shouldRespectDeviceScaleFactor(Browser browser) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setDeviceScaleFactor(3.0));
     Page page = context.newPage();
@@ -123,7 +120,7 @@ void shouldRespectDeviceScaleFactor(Browser browser) {
   }
 
 
-  @Test
+  @PlaywrightTest
   void shouldNotAllowDeviceScaleFactorWithNullViewport(Browser browser) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       browser.newContext(new Browser.NewContextOptions().setDeviceScaleFactor(1.0).setViewportSize(null));
@@ -131,7 +128,7 @@ void shouldNotAllowDeviceScaleFactorWithNullViewport(Browser browser) {
     assertTrue(e.getMessage().contains("\"deviceScaleFactor\" option is not supported with null \"viewport\""));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotAllowIsMobileWithNullViewport(Browser browser) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       browser.newContext(new Browser.NewContextOptions().setIsMobile(true).setViewportSize(null));
@@ -139,13 +136,13 @@ void shouldNotAllowIsMobileWithNullViewport(Browser browser) {
     assertTrue(e.getMessage().contains("\"isMobile\" option is not supported with null \"viewport\""));
   }
 
-  @Test
+  @PlaywrightTest
   void closeShouldWorkForEmptyContext(Browser browser) {
     BrowserContext context = browser.newContext();
     context.close();
   }
 
-  @Test
+  @PlaywrightTest
   void closeShouldAbortFutureEvent(Browser browser) {
     BrowserContext context = browser.newContext();
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -154,7 +151,7 @@ void closeShouldAbortFutureEvent(Browser browser) {
     assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   void closeShouldBeCallableTwice(Browser browser) {
     BrowserContext context = browser.newContext();
     context.close();
@@ -162,7 +159,7 @@ void closeShouldBeCallableTwice(Browser browser) {
     context.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotReportFramelessPagesOnError(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
@@ -187,7 +184,7 @@ void shouldNotReportFramelessPagesOnError(Browser browser, Server server) {
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldReturnAllOfThePages(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
@@ -199,7 +196,7 @@ void shouldReturnAllOfThePages(Browser browser) {
     context.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldCloseAllBelongingPagesOnceClosingContext(Browser browser) {
     BrowserContext context = browser.newContext();
     context.newPage();
@@ -208,14 +205,14 @@ void shouldCloseAllBelongingPagesOnceClosingContext(Browser browser) {
     assertEquals(0, context.pages().size());
   }
 
-  @Test
-  void shouldDisableJavascript(Browser browser) {
+  @PlaywrightTest
+  void shouldDisableJavascript(BrowserName browserName, Browser browser) {
     {
       BrowserContext context = browser.newContext(new Browser.NewContextOptions().setJavaScriptEnabled(false));
       Page page = context.newPage();
       page.navigate("data:text/html, <script>var something = 'forbidden'</script>");
       PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("something"));
-      if (isWebKit())
+      if (browserName == WEBKIT)
         assertTrue(e.getMessage().contains("Can\'t find variable: something"));
       else
         assertTrue(e.getMessage().contains("something is not defined"));
@@ -231,7 +228,7 @@ void shouldDisableJavascript(Browser browser) {
     }
   }
 
-  @Test
+  @PlaywrightTest
   void shouldBeAbleToNavigateAfterDisablingJavascript(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setJavaScriptEnabled(false));
     Page page = context.newPage();
@@ -239,11 +236,11 @@ void shouldBeAbleToNavigateAfterDisablingJavascript(Browser browser, Server serv
     context.close();
   }
 
-  @Test
-  void shouldWorkWithOfflineOption(Browser browser, Server server) {
+  @PlaywrightTest
+  void shouldWorkWithOfflineOption(BrowserName browserName, Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setOffline(true));
     Page page = context.newPage();
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       // Firefox navigates to an error page, and this navigation might conflict with the
       // next navigation we do in test.
       // So we need to wait for the navigation explicitly.
@@ -260,7 +257,7 @@ void shouldWorkWithOfflineOption(Browser browser, Server server) {
     context.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldEmulateNavigatorOnLine(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
@@ -272,7 +269,7 @@ void shouldEmulateNavigatorOnLine(Browser browser) {
     context.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldWaitForCondition(Page page, BrowserContext context) {
     List<String> messages = new ArrayList<>();
     page.onConsoleMessage(m -> messages.add(m.text()));
@@ -284,14 +281,14 @@ void shouldWaitForCondition(Page page, BrowserContext context) {
     assertEquals(asList("foo", "bar"), messages);
   }
 
-  @Test
+  @PlaywrightTest
   void waitForConditionTimeout(BrowserContext context) {
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> context.waitForCondition(() -> false, new BrowserContext.WaitForConditionOptions().setTimeout(100)));
     assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   void waitForConditionPageClosed(BrowserContext context) {
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> context.waitForCondition(() -> {
@@ -301,14 +298,14 @@ void waitForConditionPageClosed(BrowserContext context) {
     assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   void waitForConditionThatMayChangeToFalse(BrowserContext context) {
     int[] var = {0};
     context.waitForCondition(() -> ++var[0] == 1);
     assertEquals(1, var[0], "The predicate should be called only once.");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldPropagateCloseReasonToPendingActions(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java
index bf0ef7d5a..dcef55b54 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCDPSession.java
@@ -19,20 +19,21 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static org.junit.jupiter.api.Assertions.*;
 
-@EnabledIf(value = "com.microsoft.playwright.TestBase#isChromium", disabledReason = "Chrome Devtools Protocol supported by chromium only")
-public class TestBrowserContextCDPSession extends TestBase {
+@EnabledOnBrowser(value = CHROMIUM, reason = "Chrome Devtools Protocol supported by chromium only")
+public class TestBrowserContextCDPSession {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     CDPSession cdpSession = page.context().newCDPSession(page);
     cdpSession.send("Runtime.enable");
 
@@ -44,8 +45,8 @@ void shouldWork() {
     assertEquals("bar", foo);
   }
 
-  @Test
-  void shouldSendEvents() {
+  @PlaywrightTest
+  void shouldSendEvents(Page page, Server server) {
     CDPSession cdpSession = page.context().newCDPSession(page);
     cdpSession.send("Network.enable");
 
@@ -61,8 +62,8 @@ void shouldSendEvents() {
     assertEquals(1, events.size());
   }
 
-  @Test
-  void shouldDetachSession() {
+  @PlaywrightTest
+  void shouldDetachSession(Page page) {
     CDPSession cdpSession = page.context().newCDPSession(page);
     cdpSession.send("Runtime.enable");
 
@@ -81,8 +82,8 @@ void shouldDetachSession() {
     assertTrue(exception.getMessage().contains("Target page, context or browser has been closed"));
   }
 
-  @Test
-  void shouldThrowNiceErrors() {
+  @PlaywrightTest
+  void shouldThrowNiceErrors(Page page) {
     CDPSession cdpSession = page.context().newCDPSession(page);
 
     PlaywrightException exception = assertThrows(PlaywrightException.class, () -> {
@@ -91,8 +92,8 @@ void shouldThrowNiceErrors() {
     assertTrue(exception.getMessage().contains("'ThisCommand.DoesNotExist' wasn't found"));
   }
 
-  @Test
-  void shouldWorkWithMainFrame() {
+  @PlaywrightTest
+  void shouldWorkWithMainFrame(Page page) {
     CDPSession cdpSession = page.context().newCDPSession(page.mainFrame());
     JsonObject params = new JsonObject();
     params.addProperty("expression", "window.foo = 'bar'");
@@ -102,8 +103,8 @@ void shouldWorkWithMainFrame() {
     assertEquals("bar", foo);
   }
 
-  @Test
-  void shouldThrowIfTargetIsPartOfMain() {
+  @PlaywrightTest
+  void shouldThrowIfTargetIsPartOfMain(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     assertEquals(server.PREFIX + "/frames/one-frame.html", page.frames().get(0).url());
     assertEquals(server.PREFIX + "/frames/frame.html", page.frames().get(1).url());
@@ -114,8 +115,8 @@ void shouldThrowIfTargetIsPartOfMain() {
     assertTrue(exception.getMessage().contains("This frame does not have a separate CDP session, it is a part of the parent frame's session"));
   }
 
-  @Test
-  void shouldNotBreakPageClose() {
+  @PlaywrightTest
+  void shouldNotBreakPageClose(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     CDPSession session = page.context().newCDPSession(page);
@@ -124,8 +125,8 @@ void shouldNotBreakPageClose() {
     context.close();
   }
 
-  @Test
-  void shouldDetachWhenPageCloses() {
+  @PlaywrightTest
+  void shouldDetachWhenPageCloses(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     CDPSession session = page.context().newCDPSession(page);
@@ -137,8 +138,8 @@ void shouldDetachWhenPageCloses() {
     context.close();
   }
 
-  @Test
-  void shouldAddMultipleEventListeners() {
+  @PlaywrightTest
+  void shouldAddMultipleEventListeners(Page page, Server server) {
     CDPSession cdpSession = page.context().newCDPSession(page);
     cdpSession.send("Network.enable");
 
@@ -156,8 +157,8 @@ void shouldAddMultipleEventListeners() {
     assertEquals(2, events.size());
   }
 
-  @Test
-  void shouldEmitEventForEachCDPEvent() {
+  @PlaywrightTest
+  void shouldEmitEventForEachCDPEvent(Page page, Server server) {
     CDPSession client = page.context().newCDPSession(page);
     client.send("Network.enable");
     List<JsonObject> events = new ArrayList<>();
@@ -176,8 +177,8 @@ void shouldEmitEventForEachCDPEvent() {
       requestEvent.getAsJsonObject("params").getAsJsonObject("request").get("url").getAsString());
   }
 
-  @Test
-  void shouldRemoveEventListeners() {
+  @PlaywrightTest
+  void shouldRemoveEventListeners(Page page, Server server) {
     CDPSession cdpSession = page.context().newCDPSession(page);
     cdpSession.send("Network.enable");
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextClearCookies.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextClearCookies.java
index 7d8d24536..7f37dc421 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextClearCookies.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextClearCookies.java
@@ -16,10 +16,8 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Cookie;
-import org.junit.jupiter.api.Test;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,10 +28,8 @@
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestBrowserContextClearCookies {
-  @Test
+  @PlaywrightTest
   void shouldClearCookies(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     context.addCookies(asList(
@@ -45,7 +41,7 @@ void shouldClearCookies(Page page, BrowserContext context, Server server) {
     assertEquals("", page.evaluate("document.cookie"));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIsolateCookiesWhenClearing(BrowserContext context, Browser browser, Server server) {
     BrowserContext anotherContext = browser.newContext();
     context.addCookies(asList(
@@ -66,7 +62,7 @@ void shouldIsolateCookiesWhenClearing(BrowserContext context, Browser browser, S
     anotherContext.close();
   }
 
-  @Test
+  @PlaywrightTest
   void shouldRemoveCookiesByName(Page page, BrowserContext context, Server server) throws MalformedURLException {
     context.addCookies(Arrays.asList(
       new Cookie("cookie1", "1").setDomain(new URL(server.PREFIX).getHost()).setPath("/"),
@@ -79,7 +75,7 @@ void shouldRemoveCookiesByName(Page page, BrowserContext context, Server server)
     assertEquals("cookie2=2", page.evaluate("document.cookie"));
   }
 
-  @Test
+  @PlaywrightTest
   public void shouldRemoveCookiesByNameRegex(Page page, BrowserContext context, Server server) throws MalformedURLException {
     context.addCookies(Arrays.asList(
       new Cookie("cookie1", "1").setDomain(new URL(server.PREFIX).getHost()).setPath("/"),
@@ -92,7 +88,7 @@ public void shouldRemoveCookiesByNameRegex(Page page, BrowserContext context, Se
     assertEquals("cookie2=2", page.evaluate("document.cookie"));
   }
 
-  @Test
+  @PlaywrightTest
   public void shouldRemoveCookiesByDomain(Page page, BrowserContext context, Server server) throws MalformedURLException {
     context.addCookies(Arrays.asList(
       new Cookie("cookie1", "1").setDomain(new URL(server.PREFIX).getHost()).setPath("/"),
@@ -108,7 +104,7 @@ public void shouldRemoveCookiesByDomain(Page page, BrowserContext context, Serve
     assertEquals("cookie1=1", page.evaluate("document.cookie"));
   }
 
-  @Test
+  @PlaywrightTest
   public void shouldRemoveCookiesByPath(Page page, BrowserContext context, Server server) throws MalformedURLException {
     context.addCookies(Arrays.asList(
       new Cookie("cookie1", "1").setDomain(new URL(server.PREFIX).getHost()).setPath("/api/v1"),
@@ -125,7 +121,7 @@ public void shouldRemoveCookiesByPath(Page page, BrowserContext context, Server
     assertEquals("cookie3=3", page.evaluate("document.cookie"));
   }
 
-  @Test
+  @PlaywrightTest
   public void shouldRemoveCookiesByNameAndDomain(Page page, BrowserContext context, Server server) throws MalformedURLException {
     context.addCookies(Arrays.asList(
       new Cookie("cookie1", "1").setDomain(new URL(server.PREFIX).getHost()).setPath("/"),
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java
index a61ee5d87..450b00314 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCookies.java
@@ -16,23 +16,29 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Cookie;
 import com.microsoft.playwright.options.SameSiteAttribute;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.OS;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.microsoft.playwright.Utils.assertJsonEquals;
+import static com.microsoft.playwright.Utils.defaultSameSiteCookieValue;
 import static com.microsoft.playwright.Utils.getOS;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
+import static com.microsoft.playwright.fixtures.Env.isLinux;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextCookies extends TestBase {
-  @Test
-  void shouldGetACookie() {
+public class TestBrowserContextCookies {
+  @PlaywrightTest
+  void shouldGetACookie(Page page, BrowserContext context, Server server, BrowserName browserName) {
     page.navigate(server.EMPTY_PAGE);
     Object documentCookie = page.evaluate("() => {\n" +
       "  document.cookie = 'username=John Doe';\n" +
@@ -48,13 +54,13 @@ void shouldGetACookie() {
       "    expires: -1,\n" +
       "    httpOnly: false,\n" +
       "    secure: false,\n" +
-      "    sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "    sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "  }]", cookies);
   }
 
 
-  @Test
-  void shouldGetANonSessionCookie() {
+  @PlaywrightTest
+  void shouldGetANonSessionCookie(Page page, BrowserContext context, Server server, BrowserName browserName) {
     page.navigate(server.EMPTY_PAGE);
     // @see https://en.wikipedia.org/wiki/Year_2038_problem
     Object documentCookie = page.evaluate("() => {\n" +
@@ -71,8 +77,8 @@ void shouldGetANonSessionCookie() {
     assertEquals("/", cookies.get(0).path);
     assertFalse(cookies.get(0).httpOnly);
     assertFalse(cookies.get(0).secure);
-    assertEquals(defaultSameSiteCookieValue, cookies.get(0).sameSite);
-    assertEquals(defaultSameSiteCookieValue, cookies.get(0).sameSite);
+    assertEquals(defaultSameSiteCookieValue(browserName), cookies.get(0).sameSite);
+    assertEquals(defaultSameSiteCookieValue(browserName), cookies.get(0).sameSite);
 
     // Browsers start to cap cookies with 400 days max expires value.
     // See https://github.com/httpwg/http-extensions/pull/1732
@@ -83,8 +89,8 @@ void shouldGetANonSessionCookie() {
     assertTrue(cookies.get(0).expires > ((System.currentTimeMillis() + FOUR_HUNDRED_DAYS - FIVE_MINUTES) / 1000));
   }
 
-  @Test
-  void shouldProperlyReportHttpOnlyCookie() {
+  @PlaywrightTest
+  void shouldProperlyReportHttpOnlyCookie(Page page, BrowserContext context, Server server) {
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "name=value;HttpOnly; Path=/");
       exchange.sendResponseHeaders(200, 0);
@@ -96,13 +102,9 @@ void shouldProperlyReportHttpOnlyCookie() {
     assertTrue(cookies.get(0).httpOnly);
   }
 
-  static boolean isWebKitWindows() {
-    return isWebKit() && getOS() == Utils.OS.WINDOWS;
-  }
-
-  @Test
-  @DisabledIf(value="isWebKitWindows", disabledReason="fail")
-  void shouldProperlyReportStrictSameSiteCookie() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.WINDOWS, reason = "fail")
+  void shouldProperlyReportStrictSameSiteCookie(Page page, BrowserContext context, Server server) {
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "name=value;SameSite=Strict");
       exchange.sendResponseHeaders(200, 0);
@@ -114,9 +116,9 @@ void shouldProperlyReportStrictSameSiteCookie() {
     assertEquals(SameSiteAttribute.STRICT, cookies.get(0).sameSite);
   }
 
-  @Test
-  @DisabledIf(value="isWebKitWindows", disabledReason="fail")
-  void shouldProperlyReportLaxSameSiteCookie() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.WINDOWS, reason = "fail")
+  void shouldProperlyReportLaxSameSiteCookie(Page page, BrowserContext context, Server server) {
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "name=value;SameSite=Lax");
       exchange.sendResponseHeaders(200, 0);
@@ -128,8 +130,8 @@ void shouldProperlyReportLaxSameSiteCookie() {
     assertEquals(SameSiteAttribute.LAX, cookies.get(0).sameSite);
   }
 
-  @Test
-  void shouldGetMultipleCookies() {
+  @PlaywrightTest
+  void shouldGetMultipleCookies(Page page, BrowserContext context, Server server, BrowserName browserName) {
     page.navigate(server.EMPTY_PAGE);
     Object documentCookie = page.evaluate("() => {\n" +
       "  document.cookie = 'username=John Doe';\n" +
@@ -148,7 +150,7 @@ void shouldGetMultipleCookies() {
       "    expires: -1,\n" +
       "    httpOnly: false,\n" +
       "    secure: false,\n" +
-      "    sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "    sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "  },\n" +
       "  {\n" +
       "    name: 'username',\n" +
@@ -158,13 +160,13 @@ void shouldGetMultipleCookies() {
       "    expires: -1,\n" +
       "    httpOnly: false,\n" +
       "    secure: false,\n" +
-      "    sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "    sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "  }\n" +
       "]", cookies);
   }
 
-  @Test
-  void shouldGetCookiesFromMultipleUrls() {
+  @PlaywrightTest
+  void shouldGetCookiesFromMultipleUrls(BrowserContext context, BrowserName browserName) {
     context.addCookies(asList(
       new Cookie("doggo", "woofs").setUrl("https://foo.com"),
       new Cookie("catto", "purrs").setUrl("https://bar.com"),
@@ -179,7 +181,7 @@ void shouldGetCookiesFromMultipleUrls() {
       "  expires: -1.0,\n" +
       "  httpOnly: false,\n" +
       "  secure: true,\n" +
-      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "}, {\n" +
       "  name: 'doggo',\n" +
       "  value: 'woofs',\n" +
@@ -188,17 +190,13 @@ void shouldGetCookiesFromMultipleUrls() {
       "  expires: -1.0,\n" +
       "  httpOnly: false,\n" +
       "  secure: true,\n" +
-      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue(browserName) +"'\n" +
       "}]", cookies);
   }
 
-  static boolean isWebkitWindows() {
-    return isWebKit() && isWindows;
-  }
-
-  @Test
-  @DisabledIf(value="isWebkitWindows", disabledReason="Same site is not implemented in curl")
-  void shouldAcceptSameSiteAttribute() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.WINDOWS, reason = "Same site is not implemented in curl")
+  void shouldAcceptSameSiteAttribute(Page page, BrowserContext context, Server server, BrowserName browserName) {
     context.addCookies(asList(
       new Cookie("one", "uno").setUrl(server.EMPTY_PAGE).setSameSite(SameSiteAttribute.LAX),
       new Cookie("two", "dos").setUrl(server.EMPTY_PAGE).setSameSite(SameSiteAttribute.STRICT),
@@ -206,14 +204,14 @@ void shouldAcceptSameSiteAttribute() {
 
     page.navigate(server.EMPTY_PAGE);
     Object documentCookie = page.evaluate("document.cookie.split('; ').sort().join('; ')");
-    if (isChromium() || (isLinux && isWebKit())) {
+    if (browserName == CHROMIUM || (isLinux && browserName == WEBKIT)) {
       assertEquals("one=uno; two=dos", documentCookie);
     } else {
       assertEquals("one=uno; three=tres; two=dos", documentCookie);
     }
 
     List<SameSiteAttribute> list = context.cookies().stream().map(c -> c.sameSite).sorted().collect(Collectors.toList());
-    if (isChromium() || (isLinux && isWebKit())) {
+    if (browserName == CHROMIUM || (isLinux && browserName == WEBKIT)) {
       assertEquals(asList(SameSiteAttribute.STRICT, SameSiteAttribute.LAX), list);
     } else {
       assertEquals(asList(SameSiteAttribute.STRICT, SameSiteAttribute.LAX, SameSiteAttribute.NONE), list);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java
index cba39f28d..aa9241d66 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java
@@ -16,24 +16,27 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HttpCredentials;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.Assumptions;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestBrowserContextCredentials extends TestBase {
+public class TestBrowserContextCredentials {
 
-  static boolean isChromiumHeadedLike() {
+  static boolean isChromiumHeadedLike(BrowserName browserName) {
     // --headless=new, the default in all Chromium channels, is like headless.
-    return isChromium() && (isHeaded() || getBrowserChannelFromEnv() != null);
+    return browserName == CHROMIUM && (Env.headed() || Env.channel() != null);
   }
 
-  @Test
-  @DisabledIf(value="isChromiumHeadedLike", disabledReason="fail")
-  void shouldFailWithoutCredentials() {
+  @PlaywrightTest
+  void shouldFailWithoutCredentials(Page page, Server server, BrowserName browserName) {
+    Assumptions.assumeFalse(isChromiumHeadedLike(browserName), "fail");
     server.setAuth("/empty.html", "user", "pass");
     Response response = page.navigate(server.EMPTY_PAGE);
     assertEquals(401, response.status());
@@ -43,8 +46,8 @@ void shouldWorkWithSetHTTPCredentials() {
     // The method is not exposed in Java.
   }
 
-  @Test
-  void shouldWorkWithCorrectCredentials() {
+  @PlaywrightTest
+  void shouldWorkWithCorrectCredentials(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials("user", "pass"))) {
@@ -54,8 +57,8 @@ void shouldWorkWithCorrectCredentials() {
     }
   }
 
-  @Test
-  void shouldFailWithWrongCredentials() {
+  @PlaywrightTest
+  void shouldFailWithWrongCredentials(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials("foo", "bar"))) {
@@ -65,8 +68,8 @@ void shouldFailWithWrongCredentials() {
     }
   }
 
-  @Test
-  void shouldReturnResourceBody() {
+  @PlaywrightTest
+  void shouldReturnResourceBody(Browser browser, Server server) {
     server.setAuth("/playground.html", "user", "pass");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials("user", "pass"))) {
@@ -78,8 +81,8 @@ void shouldReturnResourceBody() {
     }
   }
 
-  @Test
-  void shouldWorkWithCorrectCredentialsAndMatchingOrigin() {
+  @PlaywrightTest
+  void shouldWorkWithCorrectCredentialsAndMatchingOrigin(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(server.PREFIX);
@@ -91,8 +94,8 @@ void shouldWorkWithCorrectCredentialsAndMatchingOrigin() {
     }
   }
 
-  @Test
-  void shouldWorkWithCorrectCredentialsAndMatchingOriginCaseInsensitive() {
+  @PlaywrightTest
+  void shouldWorkWithCorrectCredentialsAndMatchingOriginCaseInsensitive(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(server.PREFIX.toUpperCase());
@@ -104,9 +107,9 @@ void shouldWorkWithCorrectCredentialsAndMatchingOriginCaseInsensitive() {
     }
   }
 
-  @Test
-  @DisabledIf(value="isChromiumHeadedLike", disabledReason="fail")
-  void shouldFailWithCorrectCredentialsAndWrongOriginScheme() {
+  @PlaywrightTest
+  void shouldFailWithCorrectCredentialsAndWrongOriginScheme(Browser browser, Server server, BrowserName browserName) {
+    Assumptions.assumeFalse(isChromiumHeadedLike(browserName), "fail");
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginScheme(server));
@@ -117,9 +120,9 @@ void shouldFailWithCorrectCredentialsAndWrongOriginScheme() {
     }
   }
 
-  @Test
-  @DisabledIf(value="isChromiumHeadedLike", disabledReason="fail")
-  void shouldFailWithCorrectCredentialsAndWrongOriginHostname() {
+  @PlaywrightTest
+  void shouldFailWithCorrectCredentialsAndWrongOriginHostname(Browser browser, Server server, BrowserName browserName) {
+    Assumptions.assumeFalse(isChromiumHeadedLike(browserName), "fail");
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginHostname(server));
@@ -130,9 +133,9 @@ void shouldFailWithCorrectCredentialsAndWrongOriginHostname() {
     }
   }
 
-  @Test
-  @DisabledIf(value="isChromiumHeadedLike", disabledReason="fail")
-  void shouldFailWithCorrectCredentialsAndWrongOriginPort() {
+  @PlaywrightTest
+  void shouldFailWithCorrectCredentialsAndWrongOriginPort(Browser browser, Server server, BrowserName browserName) {
+    Assumptions.assumeFalse(isChromiumHeadedLike(browserName), "fail");
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginPort(server));
@@ -143,8 +146,8 @@ void shouldFailWithCorrectCredentialsAndWrongOriginPort() {
     }
   }
 
-  @Test
-  void shouldWorkWithASingleCredentialInAnArray() {
+  @PlaywrightTest
+  void shouldWorkWithASingleCredentialInAnArray(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials(asList(new HttpCredentials("user", "pass"))))) {
@@ -154,8 +157,8 @@ void shouldWorkWithASingleCredentialInAnArray() {
     }
   }
 
-  @Test
-  void shouldWorkWithMultipleCredentialsForDifferentOrigins() {
+  @PlaywrightTest
+  void shouldWorkWithMultipleCredentialsForDifferentOrigins(Browser browser, Server server) {
     server.setAuth("/empty.html", "user1", "pass1");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials(asList(
@@ -170,8 +173,8 @@ void shouldWorkWithMultipleCredentialsForDifferentOrigins() {
     }
   }
 
-  @Test
-  void shouldFallBackToCredentialsWithoutOrigin() {
+  @PlaywrightTest
+  void shouldFallBackToCredentialsWithoutOrigin(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials(asList(
@@ -186,8 +189,8 @@ void shouldFallBackToCredentialsWithoutOrigin() {
     }
   }
 
-  @Test
-  void shouldUseTheFirstMatchingCredential() {
+  @PlaywrightTest
+  void shouldUseTheFirstMatchingCredential(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials(asList(
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java
index 6f7b85eaf..26b41f2ec 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextEvents.java
@@ -16,18 +16,20 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
+import static com.microsoft.playwright.Utils.waitForCondition;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestBrowserContextEvents extends TestBase {
-  @Test
-  void consoleEventShouldWorkSmoke() {
+public class TestBrowserContextEvents {
+  @PlaywrightTest
+  void consoleEventShouldWorkSmoke(Page page, BrowserContext context) {
     ConsoleMessage message = context.waitForConsoleMessage(() -> {
       page.evaluate("console.log('hello')");
     });
@@ -35,8 +37,8 @@ void consoleEventShouldWorkSmoke() {
     assertEquals(page, message.page());
   }
 
-  @Test
-  void consoleEventShouldWorkInPopup() {
+  @PlaywrightTest
+  void consoleEventShouldWorkInPopup(Page page, BrowserContext context) {
     Page[] popup = { null };
     ConsoleMessage message = context.waitForConsoleMessage(() -> {
       popup[0] = page.waitForPopup(() -> {
@@ -48,9 +50,9 @@ void consoleEventShouldWorkInPopup() {
     assertEquals(popup[0], message.page());
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="console message from javascript: url is not reported at all")
-  void consoleEventShouldWorkInPopup2() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "console message from javascript: url is not reported at all")
+  void consoleEventShouldWorkInPopup2(Page page, BrowserContext context) {
     Page[] popup = { null };
     ConsoleMessage message = context.waitForConsoleMessage(
       new BrowserContext.WaitForConsoleMessageOptions().setPredicate(msg -> "log".equals(msg.type())),
@@ -67,9 +69,9 @@ void consoleEventShouldWorkInPopup2() {
     assertEquals(popup[0], message.page());
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="console message is not reported at all")
-  void consoleEventShouldWorkInImmediatelyClosedPopup() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "console message is not reported at all")
+  void consoleEventShouldWorkInImmediatelyClosedPopup(Page page, BrowserContext context) {
     Page[] popup = { null };
     ConsoleMessage message = context.waitForConsoleMessage(() -> {
       popup[0] = page.waitForPopup(() -> {
@@ -84,8 +86,8 @@ void consoleEventShouldWorkInImmediatelyClosedPopup() {
     assertEquals(popup[0], message.page());
   }
 
-  @Test
-  void dialogEventShouldWorkSmoke() {
+  @PlaywrightTest
+  void dialogEventShouldWorkSmoke(Page page, BrowserContext context) {
     Dialog[] dialog = { null };
     context.onDialog(d -> {
       dialog[0] = d;
@@ -98,8 +100,8 @@ void dialogEventShouldWorkSmoke() {
     assertEquals(page, dialog[0].page());
   }
 
-  @Test
-  void dialogEventShouldWorkInPopup() {
+  @PlaywrightTest
+  void dialogEventShouldWorkInPopup(Page page, BrowserContext context) {
     Dialog[] dialog = { null };
     context.onDialog(d -> {
       dialog[0] = d;
@@ -116,9 +118,9 @@ void dialogEventShouldWorkInPopup() {
     assertEquals(popup, dialog[0].page());
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="dialog from javascript: url is not reported at all")
-  void dialogEventShouldWorkInPopup2() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "dialog from javascript: url is not reported at all")
+  void dialogEventShouldWorkInPopup2(Page page, BrowserContext context) {
     Dialog[] dialog = { null };
     context.onDialog(d -> {
       dialog[0] = d;
@@ -130,8 +132,8 @@ void dialogEventShouldWorkInPopup2() {
     assertEquals(null, dialog[0].page());
   }
 
-  @Test
-  void dialogEventShouldWorkInImmdiatelyClosedPopup() {
+  @PlaywrightTest
+  void dialogEventShouldWorkInImmdiatelyClosedPopup(Page page, BrowserContext context) {
     Dialog[] dialog = { null };
     context.onDialog(d -> {
       dialog[0] = d;
@@ -150,8 +152,8 @@ void dialogEventShouldWorkInImmdiatelyClosedPopup() {
     assertEquals(popup, dialog[0].page());
   }
 
-  @Test
-  void dialogEventShouldWorkWithInlineScriptTag() {
+  @PlaywrightTest
+  void dialogEventShouldWorkWithInlineScriptTag(Page page, BrowserContext context, Server server) {
     server.setRoute("/popup.html", exchange -> {
       exchange.getResponseHeaders().add("content-type", "text/html");
       exchange.sendResponseHeaders(200, 0);
@@ -174,20 +176,20 @@ void dialogEventShouldWorkWithInlineScriptTag() {
       new Page.WaitForConditionOptions().setTimeout(5_000));
   }
 
-  @Test
-  void pageErrorEventShouldWork() {
+  @PlaywrightTest
+  void pageErrorEventShouldWork(Page page, BrowserContext context) {
     WebError[] webError = { null };
     context.onWebError(e -> {
       webError[0] = e;
     });
     page.setContent("<script>throw new Error('boom')</script>");
-    waitForCondition(() -> webError[0] != null);
+    waitForCondition(page, () -> webError[0] != null);
     assertEquals(page, webError[0].page());
     assertTrue(webError[0].error().contains("boom"), webError[0].error());
   }
 
-  @Test
-  void weberrorEventShouldIncludeLocation() {
+  @PlaywrightTest
+  void weberrorEventShouldIncludeLocation(Page page, BrowserContext context, Server server) {
     server.setRoute("/error.js", exchange -> {
       exchange.getResponseHeaders().add("content-type", "application/javascript");
       exchange.sendResponseHeaders(200, 0);
@@ -205,44 +207,44 @@ void weberrorEventShouldIncludeLocation() {
     WebError[] webError = { null };
     context.onWebError(e -> webError[0] = e);
     page.navigate(server.PREFIX + "/error.html");
-    waitForCondition(() -> webError[0] != null);
+    waitForCondition(page, () -> webError[0] != null);
     com.microsoft.playwright.options.WebErrorLocation location = webError[0].location();
     assertEquals(server.PREFIX + "/error.js", location.url);
     assertEquals(2, location.line);
     assertTrue(location.column > 0, "expected column > 0, got " + location.column);
   }
 
-  @Test
-  void pageLoadEventShouldWork() {
+  @PlaywrightTest
+  void pageLoadEventShouldWork(Page page, BrowserContext context, Server server) {
     Page[] loaded = { null };
     context.onPageLoad(p -> loaded[0] = p);
     page.navigate(server.EMPTY_PAGE);
-    waitForCondition(() -> loaded[0] != null);
+    waitForCondition(page, () -> loaded[0] != null);
     assertEquals(page, loaded[0]);
   }
 
-  @Test
-  void frameNavigatedEventShouldWork() {
+  @PlaywrightTest
+  void frameNavigatedEventShouldWork(Page page, BrowserContext context, Server server) {
     Frame[] navigated = { null };
     context.onFrameNavigated(f -> navigated[0] = f);
     page.navigate(server.EMPTY_PAGE);
-    waitForCondition(() -> navigated[0] != null);
+    waitForCondition(page, () -> navigated[0] != null);
     assertEquals(page.mainFrame(), navigated[0]);
     assertEquals(server.EMPTY_PAGE, navigated[0].url());
   }
 
-  @Test
-  void pageCloseEventShouldWork() {
+  @PlaywrightTest
+  void pageCloseEventShouldWork(Page page, BrowserContext context) {
     Page newPage = context.newPage();
     Page[] closed = { null };
     context.onPageClose(p -> closed[0] = p);
     newPage.close();
-    waitForCondition(() -> closed[0] != null);
+    waitForCondition(page, () -> closed[0] != null);
     assertEquals(newPage, closed[0]);
   }
 
-  @Test
-  void frameAttachedEventShouldWork() {
+  @PlaywrightTest
+  void frameAttachedEventShouldWork(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Frame[] attached = { null };
     context.onFrameAttached(f -> attached[0] = f);
@@ -251,12 +253,12 @@ void frameAttachedEventShouldWork() {
       "  iframe.src = 'about:blank';\n" +
       "  document.body.appendChild(iframe);\n" +
       "}");
-    waitForCondition(() -> attached[0] != null);
+    waitForCondition(page, () -> attached[0] != null);
     assertEquals(page.mainFrame(), attached[0].parentFrame());
   }
 
-  @Test
-  void frameDetachedEventShouldWork() {
+  @PlaywrightTest
+  void frameDetachedEventShouldWork(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("() => {\n" +
       "  const iframe = document.createElement('iframe');\n" +
@@ -268,12 +270,12 @@ void frameDetachedEventShouldWork() {
     Frame[] detached = { null };
     context.onFrameDetached(f -> detached[0] = f);
     page.evaluate("() => document.getElementById('x').remove()");
-    waitForCondition(() -> detached[0] != null);
+    waitForCondition(page, () -> detached[0] != null);
     assertEquals(page.mainFrame(), detached[0].parentFrame());
   }
 
-  @Test
-  void dialogClosedEventShouldWork() {
+  @PlaywrightTest
+  void dialogClosedEventShouldWork(Page page, BrowserContext context) {
     Dialog[] dialog = {null};
     Dialog[] closedOnContext = {null};
     Dialog[] closedOnPage = {null};
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
index e9c0c6385..9d3402772 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BindingCallback;
-import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,10 +26,10 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextExposeFunction extends TestBase {
+public class TestBrowserContextExposeFunction {
 
-  @Test
-  void exposeBindingShouldWork() {
+  @PlaywrightTest
+  void exposeBindingShouldWork(BrowserContext context) {
     BindingCallback.Source[] bindingSource = {null};
     context.exposeBinding("add", (source, args) -> {
       bindingSource[0] = source;
@@ -51,8 +51,8 @@ void exposeBindingShouldWork() {
     assertEquals("failure in console listener", e.getMessage());
   }
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(BrowserContext context) {
     context.exposeFunction("add", args -> (Integer) args[0] + (Integer) args[1]);
     Page page = context.newPage();
     page.exposeFunction("mul", args -> (Integer) args[0] * (Integer) args[1]);
@@ -62,8 +62,8 @@ void shouldWork() {
     assertEquals(mapOf("mul", 36, "add", 13, "sub", 5, "addHandle", 11), result);
   }
 
-  @Test
-  void shouldThrowForDuplicateRegistrations() {
+  @PlaywrightTest
+  void shouldThrowForDuplicateRegistrations(BrowserContext context) {
     context.exposeFunction("foo", args -> null);
     context.exposeFunction("bar", args -> null);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.exposeFunction("foo", args -> null));
@@ -78,8 +78,8 @@ void shouldThrowForDuplicateRegistrations() {
     assertTrue(e.getMessage().contains("Function \"baz\" has been already registered in one of the pages"));
   }
 
-  @Test
-  void shouldBeCallableFromInsideAddInitScript() {
+  @PlaywrightTest
+  void shouldBeCallableFromInsideAddInitScript(BrowserContext context) {
     List<Object> actualArgs = new ArrayList<>();
     context.exposeFunction("woof", args -> actualArgs.add(args[0]));
     context.addInitScript("window['woof']('context')");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
index 52b961ec0..7c874041e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
@@ -17,9 +17,9 @@
 package com.microsoft.playwright;
 
 import com.google.gson.Gson;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.*;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.FileOutputStream;
@@ -41,9 +41,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextFetch extends TestBase {
-  @Test
-  void getShouldWork() {
+public class TestBrowserContextFetch {
+  @PlaywrightTest
+  void getShouldWork(BrowserContext context, Server server) {
     APIResponse response = context.request().get(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
     assertEquals(200, response.status());
@@ -57,8 +57,8 @@ void getShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void getShouldReturnTiming() {
+  @PlaywrightTest
+  void getShouldReturnTiming(BrowserContext context, Server server) {
     APIResponse response = context.request().get(server.PREFIX + "/simple.json");
     assertTrue(response.ok());
     Timing timing = response.timing();
@@ -73,8 +73,8 @@ void getShouldReturnTiming() {
     assertTrue(timing.responseEnd < 60_000, "responseEnd = " + timing.responseEnd);
   }
 
-  @Test
-  void fetchShouldWork() {
+  @PlaywrightTest
+  void fetchShouldWork(BrowserContext context, Server server) {
     APIResponse response = context.request().fetch(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
     assertEquals(200, response.status());
@@ -88,23 +88,23 @@ void fetchShouldWork() {
   }
 
   //     server.setRoute("/one-style.css", exchange -> exchange.getResponseBody().close());
-  @Test
-  void shouldThrowOnNetworkError() {
+  @PlaywrightTest
+  void shouldThrowOnNetworkError(BrowserContext context, Server server) {
     server.setRoute("/test", exchange -> exchange.getResponseBody().close());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/test"));
     assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowOnNetworkErrorAfterRedirect() {
+  @PlaywrightTest
+  void shouldThrowOnNetworkErrorAfterRedirect(BrowserContext context, Server server) {
     server.setRedirect("/redirect", "/test");
     server.setRoute("/test", exchange -> exchange.getResponseBody().close());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/redirect"));
     assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowOnNetworkErrorWhenSendingBody() {
+  @PlaywrightTest
+  void shouldThrowOnNetworkErrorWhenSendingBody(BrowserContext context, Server server) {
     server.setRoute("/test", exchange -> {
       exchange.getResponseHeaders().add("content-type", "text/html");
       exchange.sendResponseHeaders(200, 4096);
@@ -116,8 +116,8 @@ void shouldThrowOnNetworkErrorWhenSendingBody() {
     assertTrue(e.getMessage().contains("aborted"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowOnNetworkErrorWhenSendingBodyAfterRedirect() {
+  @PlaywrightTest
+  void shouldThrowOnNetworkErrorWhenSendingBodyAfterRedirect(BrowserContext context, Server server) {
     server.setRedirect("/redirect", "/test");
     server.setRoute("/test", exchange -> {
       exchange.getResponseHeaders().add("content-type", "text/html");
@@ -130,8 +130,8 @@ void shouldThrowOnNetworkErrorWhenSendingBodyAfterRedirect() {
     assertTrue(e.getMessage().contains("aborted"), e.getMessage());
   }
 
-  @Test
-  void shouldAddSessionCookiesToRequest() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAddSessionCookiesToRequest(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Cookie cookie = new Cookie("username", "John Doe");
     cookie.domain = "localhost";
     cookie.path = "/";
@@ -145,8 +145,8 @@ void shouldAddSessionCookiesToRequest() throws ExecutionException, InterruptedEx
     assertEquals(asList("username=John Doe"), req.get().headers.get("cookie"));
   }
 
-  @Test
-  void getShouldSupportQueryParams() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void getShouldSupportQueryParams(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> req = server.futureRequest("/empty.html");
     context.request().get(server.EMPTY_PAGE + "?p1=foo",
       RequestOptions.create().setQueryParam("p1", "v1").setQueryParam("парам2", "знач2"));
@@ -156,23 +156,23 @@ void getShouldSupportQueryParams() throws ExecutionException, InterruptedExcepti
 
   ;
 
-  @Test
-  void getShouldSupportFailOnStatusCode() {
+  @PlaywrightTest
+  void getShouldSupportFailOnStatusCode(BrowserContext context, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       context.request().get(server.PREFIX + "/does-not-exist.html", RequestOptions.create().setFailOnStatusCode(true));
     });
     assertTrue(e.getMessage().contains("404 Not Found"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("Error: socket hang up")
-  void getShouldSupportIgnoreHTTPSErrorsOption() {
+  void getShouldSupportIgnoreHTTPSErrorsOption(BrowserContext context, HttpsServer httpsServer) {
     APIResponse response = context.request().get(httpsServer.EMPTY_PAGE, RequestOptions.create().setIgnoreHTTPSErrors(true));
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldNotAddContextCookieIfCookieHeaderPassedAsAParameter() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldNotAddContextCookieIfCookieHeaderPassedAsAParameter(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Cookie cookie = new Cookie("username", "John Doe");
     cookie.domain = "localhost";
     cookie.path = "/";
@@ -186,8 +186,8 @@ void shouldNotAddContextCookieIfCookieHeaderPassedAsAParameter() throws Executio
     assertEquals(asList("foo=bar"), req.get().headers.get("cookie"));
   }
 
-  @Test
-  void shouldFollowRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldFollowRedirects(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/redirect1", "/redirect2");
     server.setRedirect("/redirect2", "/simple.json");
     Cookie cookie = new Cookie("username", "John Doe");
@@ -210,8 +210,8 @@ private static List<String> sortedCookiePairs(String cookieHeader) {
     return Arrays.stream(cookieHeader.split(";")).map(String::trim).sorted().collect(Collectors.toList());
   }
 
-  @Test
-  void pageRequestAddCookiesShouldAddCookiesToTheBrowserContext() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void pageRequestAddCookiesShouldAddCookiesToTheBrowserContext(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     page.request().addCookies(asList(
       new Cookie("a", "b").setUrl(server.EMPTY_PAGE),
       new Cookie("c", "d").setDomain("localhost").setPath("/").setExpires(System.currentTimeMillis() / 1000 + 3600)));
@@ -224,8 +224,8 @@ void pageRequestAddCookiesShouldAddCookiesToTheBrowserContext() throws Execution
     assertEquals(asList("a=b", "c=d"), sortedCookiePairs((String) page.evaluate("document.cookie")));
   }
 
-  @Test
-  void pageRequestCookiesShouldReturnBrowserContextCookies() {
+  @PlaywrightTest
+  void pageRequestCookiesShouldReturnBrowserContextCookies(Page page, BrowserContext context, Server server) {
     context.addCookies(asList(
       new Cookie("a", "b").setUrl(server.EMPTY_PAGE),
       new Cookie("c", "d").setDomain("example.com").setPath("/")));
@@ -237,8 +237,8 @@ void pageRequestCookiesShouldReturnBrowserContextCookies() {
       new Gson().toJson(page.request().cookies(server.EMPTY_PAGE)));
   }
 
-  @Test
-  void pageRequestClearCookiesShouldClearBrowserContextCookies() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void pageRequestClearCookiesShouldClearBrowserContextCookies(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     context.addCookies(asList(
       new Cookie("a", "b").setUrl(server.EMPTY_PAGE),
       new Cookie("c", "d").setUrl(server.EMPTY_PAGE)));
@@ -251,8 +251,8 @@ void pageRequestClearCookiesShouldClearBrowserContextCookies() throws ExecutionE
     assertNull(req.get().headers.get("cookie"));
   }
 
-  @Test
-  void shouldAddCookiesFromSetCookieHeader() {
+  @PlaywrightTest
+  void shouldAddCookiesFromSetCookieHeader(Page page, BrowserContext context, Server server) {
     server.setRoute("/setcookie.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "session=value");
       exchange.getResponseHeaders().add("Set-Cookie", "foo=bar; max-age=3600");
@@ -272,9 +272,9 @@ void shouldAddCookiesFromSetCookieHeader() {
     assertEquals(asList("foo=bar", "session=value"), page.evaluate("() => document.cookie.split(';').map(s => s.trim()).sort()"));
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("Default Java's HTTP server throws on 'CONNECT non-existent.com:80 HTTP/1.1' because path is null.")
-  void shouldWorkWithContextLevelProxy() throws ExecutionException, InterruptedException {
+  void shouldWorkWithContextLevelProxy(BrowserType browserType, Server server) throws ExecutionException, InterruptedException {
     server.setRoute("/target.html", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "text/plain; charset=utf-8");
       exchange.sendResponseHeaders(200, 0);
@@ -292,8 +292,8 @@ void shouldWorkWithContextLevelProxy() throws ExecutionException, InterruptedExc
     }
   }
 
-  @Test
-  void shouldWorkWithHttpCredentials() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithHttpCredentials(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     server.setAuth("/empty.html", "user", "pass");
 
     String base64 = Base64.getEncoder().encodeToString("user:pass".getBytes(StandardCharsets.UTF_8));;
@@ -304,8 +304,8 @@ void shouldWorkWithHttpCredentials() throws ExecutionException, InterruptedExcep
     assertEquals("/empty.html", request.get().url);
   }
 
-  @Test
-  void shouldWorkWithSetHTTPCredentials() {
+  @PlaywrightTest
+  void shouldWorkWithSetHTTPCredentials(BrowserContext context, Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     APIResponse response1 = context.request().get(server.EMPTY_PAGE);
     assertEquals(401, response1.status());
@@ -317,8 +317,8 @@ void shouldWorkWithSetHTTPCredentials() {
     }
   }
 
-  @Test
-  void shouldReturnErrorWithWrongCredentials() {
+  @PlaywrightTest
+  void shouldReturnErrorWithWrongCredentials(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     try (BrowserContext context = browser.newContext(
       new Browser.NewContextOptions().setHttpCredentials("user", "wrong"))) {
@@ -327,8 +327,8 @@ void shouldReturnErrorWithWrongCredentials() {
     }
   }
 
-  @Test
-  void postShouldSupportPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void postShouldSupportPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/simple.json");
     APIResponse response = context.request().post(server.PREFIX + "/simple.json",
       RequestOptions.create().setData("My request"));
@@ -338,8 +338,8 @@ void postShouldSupportPostData() throws ExecutionException, InterruptedException
     assertEquals("/simple.json", request.get().url);
   }
 
-  @Test
-  void deleteShouldSupportPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void deleteShouldSupportPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/simple.json");
     APIResponse response = context.request().delete(server.PREFIX + "/simple.json",
       RequestOptions.create().setData("My request"));
@@ -349,8 +349,8 @@ void deleteShouldSupportPostData() throws ExecutionException, InterruptedExcepti
     assertEquals("/simple.json", request.get().url);
   }
 
-  @Test
-  void patchShouldSupportPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void patchShouldSupportPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/simple.json");
     APIResponse response = context.request().patch(server.PREFIX + "/simple.json",
       RequestOptions.create().setData("My request"));
@@ -360,8 +360,8 @@ void patchShouldSupportPostData() throws ExecutionException, InterruptedExceptio
     assertEquals("/simple.json", request.get().url);
   }
 
-  @Test
-  void putShouldSupportPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void putShouldSupportPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/simple.json");
     APIResponse response = context.request().put(server.PREFIX + "/simple.json",
       RequestOptions.create().setData("My request"));
@@ -371,8 +371,8 @@ void putShouldSupportPostData() throws ExecutionException, InterruptedException
     assertEquals("/simple.json", request.get().url);
   }
 
-  @Test
-  void getShouldSupportPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void getShouldSupportPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/simple.json");
     APIResponse response = context.request().get(server.PREFIX + "/simple.json",
       RequestOptions.create().setData("My request"));
@@ -382,8 +382,8 @@ void getShouldSupportPostData() throws ExecutionException, InterruptedException
     assertEquals("/simple.json", request.get().url);
   }
 
-  @Test
-  void headShouldSupportPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void headShouldSupportPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/simple.json");
     APIResponse response = context.request().head(server.PREFIX + "/simple.json",
       RequestOptions.create().setData("My request"));
@@ -393,8 +393,8 @@ void headShouldSupportPostData() throws ExecutionException, InterruptedException
     assertEquals("/simple.json", request.get().url);
   }
 
-  @Test
-  void shouldAddDefaultHeaders() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAddDefaultHeaders(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/empty.html");
     context.request().get(server.EMPTY_PAGE);
 
@@ -404,8 +404,8 @@ void shouldAddDefaultHeaders() throws ExecutionException, InterruptedException {
     assertEquals(asList("gzip,deflate,br"), request.get().headers.get("accept-encoding"));
   }
 
-  @Test
-  void shouldSendContentLength() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSendContentLength(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     byte[] bytes = new byte[256];
     for (int i = 0; i < 256; i++) {
       bytes[i] = (byte) i;
@@ -416,8 +416,8 @@ void shouldSendContentLength() throws ExecutionException, InterruptedException {
     assertEquals(asList("application/octet-stream"), request.get().headers.get("content-type"));
   }
 
-  @Test
-  void shouldAddDefaultHeadersToRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAddDefaultHeadersToRedirects(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/redirect", "/empty.html");
     Future<Server.Request> request = server.futureRequest("/empty.html");
     context.request().get(server.PREFIX + "/redirect");
@@ -428,8 +428,8 @@ void shouldAddDefaultHeadersToRedirects() throws ExecutionException, Interrupted
     assertEquals(asList("gzip,deflate,br"), request.get().headers.get("accept-encoding"));
   }
 
-  @Test
-  void shouldAllowToOverrideDefaultHeaders() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAllowToOverrideDefaultHeaders(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/empty.html");
     context.request().get(server.EMPTY_PAGE, RequestOptions.create()
         .setHeader(
@@ -441,8 +441,8 @@ void shouldAllowToOverrideDefaultHeaders() throws ExecutionException, Interrupte
     assertEquals(asList("br"), request.get().headers.get("accept-encoding"));
   }
 
-  @Test
-  void shouldPropagateCustomHeadersWithRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldPropagateCustomHeadersWithRedirects(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/simple.json");
     Future<Server.Request> req1 = server.futureRequest("/a/redirect1");
@@ -455,8 +455,8 @@ void shouldPropagateCustomHeadersWithRedirects() throws ExecutionException, Inte
     assertEquals(asList("bar"), req3.get().headers.get("foo"));
   }
 
-  @Test
-  void shouldPropagateExtraHttpHeadersWithRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldPropagateExtraHttpHeadersWithRedirects(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/simple.json");
     context.setExtraHTTPHeaders(mapOf("My-Secret", "Value"));
@@ -470,8 +470,8 @@ void shouldPropagateExtraHttpHeadersWithRedirects() throws ExecutionException, I
     assertEquals(asList("Value"), req3.get().headers.get("my-secret"));
   }
 
-  @Test
-  void shouldThrowOnInvalidHeaderValue() {
+  @PlaywrightTest
+  void shouldThrowOnInvalidHeaderValue(BrowserContext context, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       context.request().get(server.EMPTY_PAGE, RequestOptions.create()
         .setHeader("foo", "недопустимое значение"));
@@ -479,8 +479,8 @@ void shouldThrowOnInvalidHeaderValue() {
     assertTrue(e.getMessage().contains("Invalid character in header content"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowOnNonHttpSProtocol() {
+  @PlaywrightTest
+  void shouldThrowOnNonHttpSProtocol(BrowserContext context) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get("data:text/plain,test"));
     assertTrue(e.getMessage().contains("Protocol \"data:\" not supported"), e.getMessage());
 
@@ -488,8 +488,8 @@ void shouldThrowOnNonHttpSProtocol() {
     assertTrue(e.getMessage().contains("Protocol \"file:\" not supported"), e.getMessage());
   }
 
-  @Test
-  void shouldSupportTimeoutOption() {
+  @PlaywrightTest
+  void shouldSupportTimeoutOption(BrowserContext context, Server server) {
     server.setRoute("/slow", exchange -> {
       exchange.getResponseHeaders().add("content-type", "text/html");
       exchange.sendResponseHeaders(200, 4096);
@@ -501,8 +501,8 @@ void shouldSupportTimeoutOption() {
     assertTrue(e.getMessage().contains("Timeout 100ms exceeded"), e.getMessage());
   }
 
-  @Test
-  void shouldSupportATimeoutOf0() {
+  @PlaywrightTest
+  void shouldSupportATimeoutOf0(BrowserContext context, Server server) {
     server.setRoute("/slow", exchange -> {
       exchange.getResponseHeaders().add("content-type", "text/html");
       exchange.sendResponseHeaders(200, 4);
@@ -520,8 +520,8 @@ void shouldSupportATimeoutOf0() {
     assertEquals("done", response.text());
   }
 
-  @Test
-  void shouldRespectTimeoutAfterRedirects() {
+  @PlaywrightTest
+  void shouldRespectTimeoutAfterRedirects(BrowserContext context, Server server) {
     server.setRedirect("/redirect", "/slow");
     server.setRoute("/slow", exchange -> {
       exchange.getResponseHeaders().add("content-type", "text/html");
@@ -533,8 +533,8 @@ void shouldRespectTimeoutAfterRedirects() {
     assertTrue(e.getMessage().contains("Timeout 100ms exceeded"), e.getMessage());
   }
 
-  @Test
-  void shouldDispose() {
+  @PlaywrightTest
+  void shouldDispose(BrowserContext context, Server server) {
     APIResponse response = context.request().get(server.PREFIX + "/simple.json");
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
     response.dispose();
@@ -542,8 +542,8 @@ void shouldDispose() {
     assertTrue(e.getMessage().contains("Response has been disposed"), e.getMessage());
   }
 
-  @Test
-  void shouldDisposeWhenContextCloses() {
+  @PlaywrightTest
+  void shouldDisposeWhenContextCloses(BrowserContext context, Server server) {
     APIResponse response = context.request().get(server.PREFIX + "/simple.json");
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
     context.close();
@@ -551,8 +551,8 @@ void shouldDisposeWhenContextCloses() {
     assertTrue(e.getMessage().contains("Response has been disposed") ||
         e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
-  @Test
-  void shouldOverrideRequestParameters() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldOverrideRequestParameters(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Request pageReq = page.waitForRequest("**/*", () -> page.navigate(server.EMPTY_PAGE));
     Future<Server.Request> req = server.futureRequest("/empty.html");
     context.request().fetch(pageReq, RequestOptions.create().setMethod("POST")
@@ -571,8 +571,8 @@ public static class TestData {
     public Date nullDate;
   }
 
-  @Test
-  void shouldSerializeDateAndLocalDateTime() throws ExecutionException, InterruptedException, ParseException {
+  @PlaywrightTest
+  void shouldSerializeDateAndLocalDateTime(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException, ParseException {
     Request pageReq = page.waitForRequest("**/*", () -> page.navigate(server.EMPTY_PAGE));
     Future<Server.Request> req = server.futureRequest("/empty.html");
     TestData testData = new TestData();
@@ -585,8 +585,8 @@ void shouldSerializeDateAndLocalDateTime() throws ExecutionException, Interrupte
       new String(req.get().postBody));
   }
 
-  @Test
-  void shouldSupportOffsetDateTimeInData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSupportOffsetDateTimeInData(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     OffsetDateTime offsetDateTime = OffsetDateTime.parse("2024-07-10T10:15:30-08:00");
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
@@ -600,8 +600,8 @@ public static class LocalDateData {
     public LocalDate date;
   }
 
-  @Test
-  void shouldSupportLocalDateInData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSupportLocalDateInData(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     LocalDateData testData = new LocalDateData();
     testData.name = "foo";
@@ -612,8 +612,8 @@ void shouldSupportLocalDateInData() throws ExecutionException, InterruptedExcept
     assertEquals("{\"name\":\"foo\",\"date\":\"2022-12-23\"}", new String(body));
   }
 
-  @Test
-  void shouldSupportApplicationXWwwFormUrlencoded() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSupportApplicationXWwwFormUrlencoded(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> req = server.futureRequest("/empty.html");
     context.request().post(server.EMPTY_PAGE, RequestOptions.create().setForm(
       FormData.create()
@@ -633,8 +633,8 @@ void shouldSupportApplicationXWwwFormUrlencoded() throws ExecutionException, Int
     assertTrue(body.contains("file=f.js"), body);
   }
 
-  @Test
-  void shouldEncodeToApplicationJsonByDefault() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldEncodeToApplicationJsonByDefault(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Map<String, Object> data = mapOf(
       "firstName", "John",
       "lastName", "Doe",
@@ -650,8 +650,8 @@ void shouldEncodeToApplicationJsonByDefault() throws ExecutionException, Interru
     assertEquals(new Gson().toJson(data), body);
   }
 
-  @Test
-  void shouldSupportMultipartFormData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSupportMultipartFormData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
 
     FilePayload file = new FilePayload("f.js", "text/javascript",
@@ -683,8 +683,8 @@ void shouldSupportMultipartFormData() throws ExecutionException, InterruptedExce
     assertEquals(200, response.status());
   }
 
-  @Test
-  public void shouldSupportRepeatingNamesInMultipartFormData() throws InterruptedException, ExecutionException {
+  @PlaywrightTest
+  public void shouldSupportRepeatingNamesInMultipartFormData(BrowserContext context, Server server) throws InterruptedException, ExecutionException {
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
 
     FilePayload file1 = new FilePayload("f.js", "text/javascript",
@@ -723,8 +723,8 @@ public void shouldSupportRepeatingNamesInMultipartFormData() throws InterruptedE
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldSupportMultipartFormDataWithPathValues(@TempDir Path tmp) throws ExecutionException, InterruptedException, IOException {
+  @PlaywrightTest
+  void shouldSupportMultipartFormDataWithPathValues(BrowserContext context, Server server, @TempDir Path tmp) throws ExecutionException, InterruptedException, IOException {
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
 
     Path path = tmp.resolve("simplezip.json");
@@ -757,8 +757,8 @@ void shouldSupportMultipartFormDataWithPathValues(@TempDir Path tmp) throws Exec
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldSerializeDataToJsonRegardlessOfContentType() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSerializeDataToJsonRegardlessOfContentType(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Map<String, Object> data = mapOf(
       "firstName", "John",
       "lastName", "Doe");
@@ -772,14 +772,14 @@ void shouldSerializeDataToJsonRegardlessOfContentType() throws ExecutionExceptio
     assertEquals(new Gson().toJson(data), body);
   }
 
-  @Test
-  void shouldNotThrowWhenDataPassedForUnsupportedRequest() {
+  @PlaywrightTest
+  void shouldNotThrowWhenDataPassedForUnsupportedRequest(BrowserContext context, Server server) {
     context.request().fetch(server.EMPTY_PAGE, RequestOptions.create()
       .setMethod("GET").setData("bar"));
   }
 
-  @Test
-  void contextRequestShouldExportSameStorageStateAsContext() {
+  @PlaywrightTest
+  void contextRequestShouldExportSameStorageStateAsContext(Page page, BrowserContext context, Server server) {
     server.setRoute("/setcookie.html", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "a=b");
       exchange.getResponseHeaders().add("Set-Cookie", "c=d");
@@ -795,8 +795,8 @@ void contextRequestShouldExportSameStorageStateAsContext() {
     assertEquals(contextState, pageState);
   }
 
-  @Test
-  void shouldAcceptBoolAndNumericParams() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAcceptBoolAndNumericParams(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> req = server.futureRequest("/empty.html");
     page.request().get(server.EMPTY_PAGE, RequestOptions.create()
       .setQueryParam("str", "s")
@@ -806,8 +806,8 @@ void shouldAcceptBoolAndNumericParams() throws ExecutionException, InterruptedEx
     assertEquals("/empty.html?str=s&num=10&bool=true&bool2=false", req.get().url);
   }
 
-  @Test
-  void shouldAbortRequestsWhenBrowserContextCloses() {
+  @PlaywrightTest
+  void shouldAbortRequestsWhenBrowserContextCloses(Browser browser, Server server) {
     server.setRoute("/empty.html", exchange -> {
     });
 
@@ -828,8 +828,8 @@ void shouldAbortRequestsWhenBrowserContextCloses() {
       e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
-  void shouldWorkWithSetHTTPCredentialsAndMatchingOrigin() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithSetHTTPCredentialsAndMatchingOrigin(BrowserContext context, Browser browser, Server server) throws ExecutionException, InterruptedException {
     server.setAuth("/empty.html", "user", "pass");
     APIResponse response1 = context.request().get(server.EMPTY_PAGE);
     assertEquals(401, response1.status());
@@ -843,8 +843,8 @@ void shouldWorkWithSetHTTPCredentialsAndMatchingOrigin() throws ExecutionExcepti
     }
   }
 
-  @Test
-  void shouldWorkWithSetHTTPCredentialsAndMatchingOriginCaseInsensitive() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithSetHTTPCredentialsAndMatchingOriginCaseInsensitive(BrowserContext context, Browser browser, Server server) throws ExecutionException, InterruptedException {
     server.setAuth("/empty.html", "user", "pass");
     APIResponse response1 = context.request().get(server.EMPTY_PAGE);
     assertEquals(401, response1.status());
@@ -858,8 +858,8 @@ void shouldWorkWithSetHTTPCredentialsAndMatchingOriginCaseInsensitive() throws E
     }
   }
 
-  @Test
-  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme() {
+  @PlaywrightTest
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginScheme(server));
@@ -869,8 +869,8 @@ void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme() {
     }
   }
 
-  @Test
-  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname() {
+  @PlaywrightTest
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginHostname(server));
@@ -880,8 +880,8 @@ void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname() {
     }
   }
 
-  @Test
-  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort() {
+  @PlaywrightTest
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort(Browser browser, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginPort(server));
@@ -891,65 +891,65 @@ void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort() {
     }
   }
 
-  @Test
-  void shouldSerializeNullValuesInPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSerializeNullValuesInPostData(BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> req = server.futureRequest("/empty.html");
     APIResponse response = context.request().post(server.EMPTY_PAGE, RequestOptions.create().setData(mapOf("foo", null)));
     assertEquals(200, response.status());
     assertEquals("{\"foo\":null}", new String(req.get().postBody));
   }
 
-    @Test
-    void shouldSupportHTTPCredentialsSendImmediatelyForNewContext() throws ExecutionException, InterruptedException {
-      Browser.NewContextOptions options = new Browser.NewContextOptions().setHttpCredentials(
-          new HttpCredentials("user", "pass")
-            .setOrigin(server.PREFIX.toUpperCase())
-            .setSend(HttpCredentialsSend.ALWAYS));
-      try (BrowserContext context = browser.newContext(options)) {
-        Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
-        APIResponse response = context.request().get(server.EMPTY_PAGE);
-        assertEquals("Basic " + java.util.Base64.getEncoder().encodeToString("user:pass".getBytes()),
-          serverRequest.get().headers.getFirst("authorization"));
-        assertEquals(200, response.status());
-
-        serverRequest = server.futureRequest("/empty.html");
-        response = context.request().get(server.CROSS_PROCESS_PREFIX + "/empty.html");
-        // Not sent to another origin.
-        assertNull(serverRequest.get().headers.get("authorization"));
-        assertEquals(200, response.status());
-      }
-    }
-
-    @Test
-    void shouldSupportHTTPCredentialsSendImmediatelyForBrowserNewPage() throws ExecutionException, InterruptedException {
-      Browser.NewPageOptions options = new Browser.NewPageOptions().setHttpCredentials(
+  @PlaywrightTest
+  void shouldSupportHTTPCredentialsSendImmediatelyForNewContext(Browser browser, Server server) throws ExecutionException, InterruptedException {
+    Browser.NewContextOptions options = new Browser.NewContextOptions().setHttpCredentials(
         new HttpCredentials("user", "pass")
           .setOrigin(server.PREFIX.toUpperCase())
           .setSend(HttpCredentialsSend.ALWAYS));
-      try (Page newPage = browser.newPage(options)) {
-        Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
-        APIResponse response = newPage.request().get(server.EMPTY_PAGE);
-        assertEquals("Basic " + java.util.Base64.getEncoder().encodeToString("user:pass".getBytes()),
-          serverRequest.get().headers.getFirst("authorization"));
-        assertEquals(200, response.status());
-
-        serverRequest = server.futureRequest("/empty.html");
-        response = newPage.request().get(server.CROSS_PROCESS_PREFIX + "/empty.html");
-        // Not sent to another origin.
-        assertNull(serverRequest.get().headers.get("authorization"));
-        assertEquals(200, response.status());
-      }
+    try (BrowserContext context = browser.newContext(options)) {
+      Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+      APIResponse response = context.request().get(server.EMPTY_PAGE);
+      assertEquals("Basic " + java.util.Base64.getEncoder().encodeToString("user:pass".getBytes()),
+        serverRequest.get().headers.getFirst("authorization"));
+      assertEquals(200, response.status());
+
+      serverRequest = server.futureRequest("/empty.html");
+      response = context.request().get(server.CROSS_PROCESS_PREFIX + "/empty.html");
+      // Not sent to another origin.
+      assertNull(serverRequest.get().headers.get("authorization"));
+      assertEquals(200, response.status());
     }
+  }
+
+  @PlaywrightTest
+  void shouldSupportHTTPCredentialsSendImmediatelyForBrowserNewPage(Browser browser, Server server) throws ExecutionException, InterruptedException {
+    Browser.NewPageOptions options = new Browser.NewPageOptions().setHttpCredentials(
+      new HttpCredentials("user", "pass")
+        .setOrigin(server.PREFIX.toUpperCase())
+        .setSend(HttpCredentialsSend.ALWAYS));
+    try (Page newPage = browser.newPage(options)) {
+      Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+      APIResponse response = newPage.request().get(server.EMPTY_PAGE);
+      assertEquals("Basic " + java.util.Base64.getEncoder().encodeToString("user:pass".getBytes()),
+        serverRequest.get().headers.getFirst("authorization"));
+      assertEquals(200, response.status());
+
+      serverRequest = server.futureRequest("/empty.html");
+      response = newPage.request().get(server.CROSS_PROCESS_PREFIX + "/empty.html");
+      // Not sent to another origin.
+      assertNull(serverRequest.get().headers.get("authorization"));
+      assertEquals(200, response.status());
+    }
+  }
 
-  @Test
-  void shouldNotWorkAfterContextDispose() {
+  @PlaywrightTest
+  void shouldNotWorkAfterContextDispose(BrowserContext context, Server server) {
     context.close(new BrowserContext.CloseOptions().setReason("Test ended."));
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.EMPTY_PAGE));
     assertTrue(e.getMessage().contains("Test ended."), e.getMessage());
   }
 
-  @Test
-  public void shouldRetryECONNRESET() {
+  @PlaywrightTest
+  public void shouldRetryECONNRESET(BrowserContext context, Server server) {
     int[] requestCount = {0};
     server.setRoute("/test", exchange -> {
       if (requestCount[0]++ < 3) {
@@ -972,8 +972,8 @@ public void shouldRetryECONNRESET() {
     assertEquals(4, requestCount[0]);
   }
 
-  @Test
-  void shouldSupportMultipleHttpCredentials() {
+  @PlaywrightTest
+  void shouldSupportMultipleHttpCredentials(Browser browser, Server server) {
     server.setAuth("/empty.html", "user1", "pass1");
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials(asList(
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
index 02b072c19..2891233c2 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
@@ -16,12 +16,12 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HarMode;
 import com.microsoft.playwright.options.HarNotFound;
 import com.microsoft.playwright.options.RouteFromHarUpdateContentPolicy;
 import com.microsoft.playwright.options.Timing;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -39,12 +39,13 @@
 import static com.microsoft.playwright.Utils.copy;
 import static com.microsoft.playwright.Utils.extractZip;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static com.microsoft.playwright.options.HarContentPolicy.ATTACH;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextHar extends TestBase {
-  @Test
-  void shouldContextRouteFromHARMatchingTheMethodAndFollowingRedirects() {
+public class TestBrowserContextHar {
+  @PlaywrightTest
+  void shouldContextRouteFromHARMatchingTheMethodAndFollowingRedirects(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     context.routeFromHAR(path);
     Page page = context.newPage();
@@ -55,8 +56,8 @@ void shouldContextRouteFromHARMatchingTheMethodAndFollowingRedirects() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgb(255, 0, 0)");
   }
 
-  @Test
-  void shouldPageRouteFromHARMatchingTheMethodAndFollowingRedirects() {
+  @PlaywrightTest
+  void shouldPageRouteFromHARMatchingTheMethodAndFollowingRedirects(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     Page page = context.newPage();
     page.routeFromHAR(path);
@@ -67,8 +68,8 @@ void shouldPageRouteFromHARMatchingTheMethodAndFollowingRedirects() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgb(255, 0, 0)");
   }
 
-  @Test
-  void fallbackContinueShouldContinueWhenNotFoundInHar() {
+  @PlaywrightTest
+  void fallbackContinueShouldContinueWhenNotFoundInHar(BrowserContext context, Server server) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setNotFound(HarNotFound.FALLBACK));
     Page page = context.newPage();
@@ -76,16 +77,16 @@ void fallbackContinueShouldContinueWhenNotFoundInHar() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgb(255, 192, 203)");
   }
 
-  @Test
-  void byDefaultShouldAbortRequestsNotFoundInHar() {
+  @PlaywrightTest
+  void byDefaultShouldAbortRequestsNotFoundInHar(BrowserContext context, Server server) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     context.routeFromHAR(path);
     Page page = context.newPage();
     assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
   }
 
-  @Test
-  void fallbackContinueShouldContinueRequestsOnBadHar(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void fallbackContinueShouldContinueRequestsOnBadHar(BrowserContext context, Server server, @TempDir Path tmpDir) throws IOException {
     Path path = tmpDir.resolve("test.har");
     try (Writer stream = new OutputStreamWriter(Files.newOutputStream(path))) {
       stream.write("{ \"log\" : {} }");
@@ -96,8 +97,8 @@ void fallbackContinueShouldContinueRequestsOnBadHar(@TempDir Path tmpDir) throws
     assertThat(page.locator("body")).hasCSS("background-color", "rgb(255, 192, 203)");
   }
 
-  @Test
-  void shouldOnlyHandleRequestsMatchingUrlFilter() {
+  @PlaywrightTest
+  void shouldOnlyHandleRequestsMatchingUrlFilter(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setNotFound(HarNotFound.FALLBACK).setUrl("**/*.js"));
     Page page = context.newPage();
@@ -114,8 +115,8 @@ void shouldOnlyHandleRequestsMatchingUrlFilter() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgba(0, 0, 0, 0)");
   }
 
-  @Test
-  void shouldOnlyContextRouteFromHARRequestsMatchingUrlFilter() {
+  @PlaywrightTest
+  void shouldOnlyContextRouteFromHARRequestsMatchingUrlFilter(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setUrl("**/*.js"));
     Page page = context.newPage();
@@ -132,8 +133,8 @@ void shouldOnlyContextRouteFromHARRequestsMatchingUrlFilter() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgba(0, 0, 0, 0)");
   }
 
-  @Test
-  void shouldOnlyPageRouteFromHARRequestsMatchingUrlFilter() {
+  @PlaywrightTest
+  void shouldOnlyPageRouteFromHARRequestsMatchingUrlFilter(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     Page page = context.newPage();
     page.routeFromHAR(path, new Page.RouteFromHAROptions().setUrl("**/*.js"));
@@ -150,8 +151,8 @@ void shouldOnlyPageRouteFromHARRequestsMatchingUrlFilter() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgba(0, 0, 0, 0)");
   }
 
-  @Test
-  void shouldSupportRegexFilter() {
+  @PlaywrightTest
+  void shouldSupportRegexFilter(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setUrl(Pattern.compile(".*(\\.js|.*\\.css|no.playwright\\/)$")));
     Page page = context.newPage();
@@ -160,8 +161,8 @@ void shouldSupportRegexFilter() {
     assertThat(page.locator("body")).hasCSS("background-color", "rgb(255, 0, 0)");
   }
 
-  @Test
-  void newPageShouldFulfillFromHarMatchingTheMethodAndFollowingRedirects() {
+  @PlaywrightTest
+  void newPageShouldFulfillFromHarMatchingTheMethodAndFollowingRedirects(Browser browser) {
     Path path = Paths.get("src/test/resources/har-fulfill.har");
     Page page = browser.newPage();
     page.routeFromHAR(path);
@@ -173,8 +174,8 @@ void newPageShouldFulfillFromHarMatchingTheMethodAndFollowingRedirects() {
     page.close();
   }
 
-  @Test
-  void shouldChangeDocumentURLAfterRedirectedNavigation() {
+  @PlaywrightTest
+  void shouldChangeDocumentURLAfterRedirectedNavigation(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-redirect.har");
     context.routeFromHAR(path);
     Page page = context.newPage();
@@ -187,8 +188,8 @@ void shouldChangeDocumentURLAfterRedirectedNavigation() {
     assertEquals("https://www.theverge.com/", page.evaluate("location.href"));
   }
 
-  @Test
-  void shouldChangeDocumentURLAfterRedirectedNavigationOnClick() {
+  @PlaywrightTest
+  void shouldChangeDocumentURLAfterRedirectedNavigationOnClick(BrowserContext context, Server server) {
     Path path = Paths.get("src/test/resources/har-redirect.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setUrl(Pattern.compile(".*theverge.*")));
     Page page = context.newPage();
@@ -200,8 +201,8 @@ void shouldChangeDocumentURLAfterRedirectedNavigationOnClick() {
     assertEquals("https://www.theverge.com/", page.evaluate("location.href"));
   }
 
-  @Test
-  void shouldGoBackToRedirectedNavigation() {
+  @PlaywrightTest
+  void shouldGoBackToRedirectedNavigation(BrowserContext context, Server server) {
     Path path = Paths.get("src/test/resources/har-redirect.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setUrl(Pattern.compile(".*theverge.*")));
     Page page = context.newPage();
@@ -214,9 +215,9 @@ void shouldGoBackToRedirectedNavigation() {
     assertEquals("https://www.theverge.com/", page.evaluate("location.href"));
   }
 
-  @Test
-  @DisabledIf(value="isFirefox", disabledReason="Flaky in Firefox, upstream as well")
-  void shouldGoForwardToRedirectedNavigation() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "Flaky in Firefox, upstream as well")
+  void shouldGoForwardToRedirectedNavigation(BrowserContext context, Server server) {
     Path path = Paths.get("src/test/resources/har-redirect.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setUrl(Pattern.compile(".*theverge.*")));
     Page page = context.newPage();
@@ -232,8 +233,8 @@ void shouldGoForwardToRedirectedNavigation() {
     assertEquals("https://www.theverge.com/", page.evaluate("() => location.href"));
   }
 
-  @Test
-  void shouldReloadRedirectedNavigation() {
+  @PlaywrightTest
+  void shouldReloadRedirectedNavigation(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-redirect.har");
     context.routeFromHAR(path, new BrowserContext.RouteFromHAROptions().setUrl(Pattern.compile(".*theverge.*")));
     Page page = context.newPage();
@@ -245,8 +246,8 @@ void shouldReloadRedirectedNavigation() {
     assertEquals("https://www.theverge.com/", page.evaluate("() => location.href"));
   }
 
-  @Test
-  void shouldFulfillFromHarWithContentInAFile() {
+  @PlaywrightTest
+  void shouldFulfillFromHarWithContentInAFile(BrowserContext context) {
     Path path = Paths.get("src/test/resources/har-sha1.har");
     context.routeFromHAR(path);
     Page page = context.newPage();
@@ -254,8 +255,8 @@ void shouldFulfillFromHarWithContentInAFile() {
     assertEquals("<html><head></head><body>Hello, world</body></html>", page.content());
   }
 
-  @Test
-  void shouldRoundTripHarZip(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldRoundTripHarZip(Browser browser, Server server, @TempDir Path tmpDir) {
     Path harPath = tmpDir.resolve("har.zip");
     try (BrowserContext context1 = browser.newContext(new Browser.NewContextOptions()
       .setRecordHarPath(harPath)
@@ -272,8 +273,8 @@ void shouldRoundTripHarZip(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldProduceExtractedZip(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldProduceExtractedZip(Browser browser, Server server, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("har.har");
     try (BrowserContext context1 = browser.newContext(new Browser.NewContextOptions()
       .setRecordHarPath(harPath)
@@ -294,8 +295,8 @@ void shouldProduceExtractedZip(@TempDir Path tmpDir) throws IOException {
     }
   }
 
-  @Test
-  void shouldRoundTripExtractedHarZip(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldRoundTripExtractedHarZip(Browser browser, Server server, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("har.zip");
     try (BrowserContext context1 = browser.newContext(new Browser.NewContextOptions()
       .setRecordHarPath(harPath)
@@ -316,8 +317,8 @@ void shouldRoundTripExtractedHarZip(@TempDir Path tmpDir) throws IOException {
     }
   }
 
-  @Test
-  void shouldRoundTripHarWithPostData(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldRoundTripHarWithPostData(Browser browser, Server server, @TempDir Path tmpDir) {
     server.setRoute("/echo", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStream out = exchange.getResponseBody()) {
@@ -352,8 +353,8 @@ void shouldRoundTripHarWithPostData(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldDisambiguateByHeader(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldDisambiguateByHeader(Browser browser, Server server, @TempDir Path tmpDir) {
     server.setRoute("/echo", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStream out = exchange.getResponseBody()) {
@@ -398,8 +399,8 @@ void shouldDisambiguateByHeader(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldUpdateHarZipForContext(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldUpdateHarZipForContext(Browser browser, Server server, @TempDir Path tmpDir) {
     Path harPath = tmpDir.resolve("har.zip");
     try (BrowserContext context1 = browser.newContext()) {
       context1.routeFromHAR(harPath, new BrowserContext.RouteFromHAROptions().setUpdate(true));
@@ -415,8 +416,8 @@ void shouldUpdateHarZipForContext(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldUpdateHarZipForPage(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldUpdateHarZipForPage(Browser browser, Server server, @TempDir Path tmpDir) {
     Path harPath = tmpDir.resolve("har.zip");
     try (BrowserContext context1 = browser.newContext()) {
       Page page1 = context1.newPage();
@@ -432,8 +433,8 @@ void shouldUpdateHarZipForPage(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldUpdateHarZipForPageWithDifferentOptions(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldUpdateHarZipForPageWithDifferentOptions(Browser browser, Server server, @TempDir Path tmpDir) {
     Path harPath = tmpDir.resolve("har.zip");
     try (BrowserContext context1 = browser.newContext()) {
       Page page1 = context1.newPage();
@@ -453,8 +454,8 @@ void shouldUpdateHarZipForPageWithDifferentOptions(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldUpdateExtractedHarZipForPage(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldUpdateExtractedHarZipForPage(Browser browser, Server server, @TempDir Path tmpDir) {
     Path harPath = tmpDir.resolve("har.har");
     try (BrowserContext context1 = browser.newContext()) {
       Page page1 = context1.newPage();
@@ -470,8 +471,8 @@ void shouldUpdateExtractedHarZipForPage(@TempDir Path tmpDir) {
     }
   }
 
-  @Test
-  void shouldIgnoreAbortedRequests(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldIgnoreAbortedRequests(Page page, Browser browser, Server server, @TempDir Path tmpDir) {
     Path path = tmpDir.resolve("test.har");
     try (BrowserContext context1 = browser.newContext()) {
       server.setRoute("/x", exchange -> exchange.close());
@@ -503,7 +504,7 @@ void shouldIgnoreAbortedRequests(@TempDir Path tmpDir) {
     }
   }
 
-  private void setJsonRoute(String path, String json) {
+  private void setJsonRoute(Server server, String path, String json) {
     server.setRoute(path, exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "application/json");
       byte[] body = json.getBytes(StandardCharsets.UTF_8);
@@ -514,9 +515,9 @@ private void setJsonRoute(String path, String json) {
     });
   }
 
-  @Test
-  void shouldNotInterceptAPIRequestContextRequestsByDefault(@TempDir Path tmpDir) {
-    setJsonRoute("/api/data", "{\"hello\": \"live\"}");
+  @PlaywrightTest
+  void shouldNotInterceptAPIRequestContextRequestsByDefault(Browser browser, Server server, @TempDir Path tmpDir) {
+    setJsonRoute(server, "/api/data", "{\"hello\": \"live\"}");
     Path harPath = tmpDir.resolve("api.har");
     try (BrowserContext context1 = browser.newContext()) {
       context1.routeFromHAR(harPath, new BrowserContext.RouteFromHAROptions().setUpdate(true));
@@ -526,7 +527,7 @@ void shouldNotInterceptAPIRequestContextRequestsByDefault(@TempDir Path tmpDir)
     }
 
     // Without the option, the live network is hit.
-    setJsonRoute("/api/data", "{\"hello\": \"fresh\"}");
+    setJsonRoute(server, "/api/data", "{\"hello\": \"fresh\"}");
     try (BrowserContext context2 = browser.newContext()) {
       context2.routeFromHAR(harPath, new BrowserContext.RouteFromHAROptions().setNotFound(HarNotFound.FALLBACK));
       Page page2 = context2.newPage();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextLocale.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextLocale.java
index d2dfefec1..398d01cc7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextLocale.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextLocale.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.LoadState;
-import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -25,9 +25,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestBrowserContextLocale extends TestBase {
-  @Test
-  void shouldAffectAcceptLanguageHeader() throws ExecutionException, InterruptedException {
+public class TestBrowserContextLocale {
+  @PlaywrightTest
+  void shouldAffectAcceptLanguageHeader(Browser browser, Server server) throws ExecutionException, InterruptedException {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("fr-FR"));
     Page page = context.newPage();
     Future<Server.Request> request = server.futureRequest("/empty.html");
@@ -36,8 +36,8 @@ void shouldAffectAcceptLanguageHeader() throws ExecutionException, InterruptedEx
     context.close();
   }
 
-  @Test
-  void shouldAffectNavigatorLanguage() {
+  @PlaywrightTest
+  void shouldAffectNavigatorLanguage(Browser browser) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("fr-FR"));
     Page page = context.newPage();
     assertEquals("fr-FR", page.evaluate("() => navigator.language"));
@@ -45,8 +45,8 @@ void shouldAffectNavigatorLanguage() {
   }
 
 
-  @Test
-  void shouldFormatNumber() {
+  @PlaywrightTest
+  void shouldFormatNumber(Browser browser, Server server) {
     {
       BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("en-US"));
       Page page = context.newPage();
@@ -63,8 +63,8 @@ void shouldFormatNumber() {
     }
   }
 
-  @Test
-  void shouldFormatDate() {
+  @PlaywrightTest
+  void shouldFormatDate(Browser browser, Server server) {
     {
       BrowserContext context = browser.newContext(new Browser.NewContextOptions()
         .setLocale("en-US").setTimezoneId("America/Los_Angeles"));
@@ -85,8 +85,8 @@ void shouldFormatDate() {
     }
   }
 
-  @Test
-  void shouldFormatNumberInPopups() {
+  @PlaywrightTest
+  void shouldFormatNumberInPopups(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("fr-FR"));
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -98,8 +98,8 @@ void shouldFormatNumberInPopups() {
     context.close();
   }
 
-  @Test
-  void shouldAffectNavigatorLanguageInPopups() {
+  @PlaywrightTest
+  void shouldAffectNavigatorLanguageInPopups(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("fr-FR"));
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -111,8 +111,8 @@ void shouldAffectNavigatorLanguageInPopups() {
     context.close();
   }
 
-  @Test
-  void shouldWorkForMultiplePagesSharingSameProcess() {
+  @PlaywrightTest
+  void shouldWorkForMultiplePagesSharingSameProcess(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("ru-RU"));
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -123,8 +123,8 @@ void shouldWorkForMultiplePagesSharingSameProcess() {
     context.close();
   }
 
-  @Test
-  void shouldBeIsolatedBetweenContexts() {
+  @PlaywrightTest
+  void shouldBeIsolatedBetweenContexts(Browser browser) {
     BrowserContext context1 = browser.newContext(new Browser.NewContextOptions().setLocale("en-US"));
     // By default firefox limits number of child web processes to 8.
     for (int i = 0; i < 8; i++)
@@ -142,8 +142,8 @@ void shouldBeIsolatedBetweenContexts() {
     context2.close();
   }
 
-  @Test
-  void shouldNotChangeDefaultLocaleInAnotherContext() {
+  @PlaywrightTest
+  void shouldNotChangeDefaultLocaleInAnotherContext(Browser browser) {
     Function<BrowserContext, String> getContextLocale = (context) -> {
       Page page = context.newPage();
       return (String) page.evaluate("(new Intl.NumberFormat()).resolvedOptions().locale");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextNetworkEvents.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextNetworkEvents.java
index 29c08bfe6..b87597bee 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextNetworkEvents.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextNetworkEvents.java
@@ -16,18 +16,20 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.sun.net.httpserver.Filter;
-import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextNetworkEvents extends TestBase {
-  @Test
-  void BrowserContextEventsRequest() {
+public class TestBrowserContextNetworkEvents {
+  @PlaywrightTest
+  void BrowserContextEventsRequest(Page page, BrowserContext context, Server server, BrowserName browserName) {
     List<String> requests = new ArrayList<>();
     context.onRequest(request -> requests.add(request.url()));
     page.navigate(server.EMPTY_PAGE);
@@ -35,7 +37,7 @@ void BrowserContextEventsRequest() {
     Page page1 = context.waitForPage(() -> page.click("a"));
     page1.waitForLoadState();
     // In firefox one-style.css is requested multiple times.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals(asList(
         server.EMPTY_PAGE,
         server.PREFIX + "/one-style.html",
@@ -49,8 +51,8 @@ void BrowserContextEventsRequest() {
     }
   }
 
-  @Test
-  void BrowserContextEventsResponse() {
+  @PlaywrightTest
+  void BrowserContextEventsResponse(Page page, BrowserContext context, Server server, BrowserName browserName) {
     List<String> responses = new ArrayList<>();
     context.onResponse(response -> responses.add(response.url()));
     page.navigate(server.EMPTY_PAGE);
@@ -58,7 +60,7 @@ void BrowserContextEventsResponse() {
     Page page1 = context.waitForPage(() -> page.click("a"));
     page1.waitForLoadState();
     // In firefox one-style.css is requested multiple times.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals(asList(
         server.EMPTY_PAGE,
         server.PREFIX + "/one-style.html",
@@ -72,14 +74,14 @@ void BrowserContextEventsResponse() {
     }
   }
 
-  @Test
-  void BrowserContextEventsRequestFailed() {
+  @PlaywrightTest
+  void BrowserContextEventsRequestFailed(Page page, BrowserContext context, Server server, BrowserName browserName) {
     server.setRoute("/one-style.css", exchange -> exchange.getResponseBody().close());
     List<Request> failedRequests = new ArrayList<>();
     context.onRequestFailed(request -> failedRequests.add(request));
     page.navigate(server.PREFIX + "/one-style.html");
     // In firefox one-style.css is requested multiple times.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertTrue(failedRequests.size() > 0);
     } else {
       assertEquals(1, failedRequests.size());
@@ -91,8 +93,8 @@ void BrowserContextEventsRequestFailed() {
   }
 
 
-  @Test
-  void BrowserContextEventsRequestFinished() {
+  @PlaywrightTest
+  void BrowserContextEventsRequestFinished(Page page, BrowserContext context, Server server) {
     Request[] requestRef = {null};
     context.onRequestFinished(r -> requestRef[0] = r);
     Response response = page.navigate(server.EMPTY_PAGE);
@@ -104,8 +106,8 @@ void BrowserContextEventsRequestFinished() {
     assertNull(request.failure());
   }
 
-  @Test
-  void shouldFireEventsInProperOrder() {
+  @PlaywrightTest
+  void shouldFireEventsInProperOrder(Page page, BrowserContext context, Server server) {
     List<String> events = new ArrayList<>();
     context.onRequest(r -> events.add("request"));
     context.onResponse(r -> events.add("response"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java
index 7f2f2657f..4de92225e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java
@@ -16,25 +16,24 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Proxy;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.condition.EnabledIf;
 
 import java.io.OutputStreamWriter;
 import java.util.Base64;
 import java.util.List;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextProxy extends TestBase {
+public class TestBrowserContextProxy {
   void shouldThrowForBadServerValue() {
     // Enforced by compiler in Java
   }
 
-  @Test
-  void shouldUseProxy() {
+  @PlaywrightTest
+  void shouldUseProxy(Browser browser, Server server) {
     server.setRoute("/target.html", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
@@ -48,8 +47,8 @@ void shouldUseProxy() {
     context.close();
   }
 
-  @Test
-  void shouldUseProxyTwice() {
+  @PlaywrightTest
+  void shouldUseProxyTwice(Browser browser, Server server) {
     server.setRoute("/target.html", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
@@ -65,8 +64,8 @@ void shouldUseProxyTwice() {
     context.close();
   }
 
-  @Test
-  void shouldUseProxyForSecondPage() {
+  @PlaywrightTest
+  void shouldUseProxyForSecondPage(Browser browser, Server server) {
     server.setRoute("/target.html", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
@@ -87,8 +86,8 @@ void shouldUseProxyForSecondPage() {
     context.close();
   }
 
-  @Test
-  void shouldWorkWithIPPORTNotion() {
+  @PlaywrightTest
+  void shouldWorkWithIPPORTNotion(Browser browser, Server server) {
     server.setRoute("/target.html", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
@@ -104,8 +103,8 @@ void shouldWorkWithIPPORTNotion() {
     context.close();
   }
 
-  @Test
-  void shouldAuthenticate() {
+  @PlaywrightTest
+  void shouldAuthenticate(Browser browser, Server server) {
     server.setRoute("/target.html", exchange -> {
       List<String> auth = exchange.getRequestHeaders().get("proxy-authorization");
       if (auth == null) {
@@ -129,13 +128,9 @@ void shouldAuthenticate() {
     context.close();
   }
 
-  static boolean isChromiumHeaded() {
-    return isChromium() && isHeaded();
-  }
-
-  @Test
-  @DisabledIf(value="isChromiumHeaded", disabledReason="fixme")
-  void shouldExcludePatterns() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, headed = true, reason = "fixme")
+  void shouldExcludePatterns(Browser browser, Server server) {
     server.setRoute("/target.html", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
@@ -188,8 +183,8 @@ void shouldUseSocksProxyInSecondPage() {
     // TODO: implement socks server
   }
 
-  @Test
-  void doesLaunchWithoutAPort() {
+  @PlaywrightTest
+  void doesLaunchWithoutAPort(Browser browser) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setProxy(
       new Proxy("http://localhost")));
     context.close();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
index be4b21432..239da5940 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -29,10 +29,10 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextRoute extends TestBase {
+public class TestBrowserContextRoute {
 
-  @Test
-  void shouldIntercept() {
+  @PlaywrightTest
+  void shouldIntercept(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     boolean[] intercepted = {false};
     Page page = context.newPage();
@@ -55,8 +55,8 @@ void shouldIntercept() {
     context.close();
   }
 
-  @Test
-  void shouldUnroute() {
+  @PlaywrightTest
+  void shouldUnroute(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
 
@@ -94,8 +94,8 @@ void shouldUnroute() {
     context.close();
   }
 
-  @Test
-  void shouldYieldToPageRoute() {
+  @PlaywrightTest
+  void shouldYieldToPageRoute(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     context.route("**/empty.html", route -> {
       route.fulfill(new Route.FulfillOptions().setStatus(200).setBody("context"));
@@ -110,8 +110,8 @@ void shouldYieldToPageRoute() {
     context.close();
   }
 
-  @Test
-  void shouldFallBackToContextRoute() {
+  @PlaywrightTest
+  void shouldFallBackToContextRoute(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     context.route("**/empty.html", route -> {
       route.fulfill(new Route.FulfillOptions().setStatus(200).setBody("context"));
@@ -126,8 +126,8 @@ void shouldFallBackToContextRoute() {
     context.close();
   }
 
-  @Test
-  void shouldSupportTheTimesParameterWithRouteMatching() {
+  @PlaywrightTest
+  void shouldSupportTheTimesParameterWithRouteMatching(Page page, BrowserContext context, Server server) {
     int[] intercepted = {0};
     context.route("**/empty.html", route -> {
       ++intercepted[0];
@@ -139,8 +139,8 @@ void shouldSupportTheTimesParameterWithRouteMatching() {
     assertEquals(2, intercepted[0]);
   }
 
-  @Test
-  void shouldOverwritePostBodyWithEmptyString() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldOverwritePostBodyWithEmptyString(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     boolean[] routeHandled = {false};
     context.route("**/empty.html", route -> {
       route.resume(new Route.ResumeOptions().setPostData(""));
@@ -163,8 +163,8 @@ void shouldOverwritePostBodyWithEmptyString() throws ExecutionException, Interru
     assertEquals(0, body.length);
   }
 
-  @Test
-  void shouldNotSwallowExceptionsInRoute() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldNotSwallowExceptionsInRoute(Page page, BrowserContext context, Server server) throws ExecutionException, InterruptedException {
     context.route("**/empty.html", route -> {
       throw new RuntimeException("My Exception");
     });
@@ -173,9 +173,9 @@ void shouldNotSwallowExceptionsInRoute() throws ExecutionException, InterruptedE
     assertTrue(e.getMessage().contains("My Exception"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("Conflicts with https://github.com/microsoft/playwright-java/pull/680")
-  void shouldNotSwallowExceptionsInFulfill() throws ExecutionException, InterruptedException {
+  void shouldNotSwallowExceptionsInFulfill(Page page, Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(server.EMPTY_PAGE);
     response.dispose();
@@ -187,9 +187,9 @@ void shouldNotSwallowExceptionsInFulfill() throws ExecutionException, Interrupte
     assertTrue(e.getMessage().contains("Fetch response has been disposed"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("Conflicts with https://github.com/microsoft/playwright-java/pull/680")
-  void shouldNotSwallowExceptionsInResume() throws ExecutionException, InterruptedException {
+  void shouldNotSwallowExceptionsInResume(Page page, Server server) throws ExecutionException, InterruptedException {
     page.route("**/*", route -> {
       route.resume(new Route.ResumeOptions().setUrl("file:///tmp"));
     });
@@ -198,8 +198,8 @@ void shouldNotSwallowExceptionsInResume() throws ExecutionException, Interrupted
   }
 
 
-  @Test
-  void shouldChainFallback() {
+  @PlaywrightTest
+  void shouldChainFallback(Page page, BrowserContext context, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     context.route("**/empty.html", route -> {
       intercepted.add(1);
@@ -217,8 +217,8 @@ void shouldChainFallback() {
     assertEquals(asList(3, 2, 1), intercepted);
   }
 
-  @Test
-  void shouldNotChainFulfill() {
+  @PlaywrightTest
+  void shouldNotChainFulfill(Page page, BrowserContext context, Server server) {
     boolean[] failed = {false};
     context.route("**/empty.html", route -> {
       failed[0] = true;
@@ -235,8 +235,8 @@ void shouldNotChainFulfill() {
     assertFalse(failed[0]);
   }
 
-  @Test
-  void shouldNotChainAbort() {
+  @PlaywrightTest
+  void shouldNotChainAbort(Page page, BrowserContext context, Server server) {
     boolean[] failed = {false};
     context.route("**/empty.html", route -> {
       failed[0] = true;
@@ -252,8 +252,8 @@ void shouldNotChainAbort() {
     assertFalse(failed[0]);
   }
 
-  @Test
-  void shouldChainFallbackIntoPage() {
+  @PlaywrightTest
+  void shouldChainFallbackIntoPage(Page page, BrowserContext context, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     context.route("**/empty.html", route -> {
       intercepted.add(1);
@@ -283,8 +283,8 @@ void shouldChainFallbackIntoPage() {
     assertEquals(asList(6, 5, 4, 3, 2, 1), intercepted);
   }
 
-  @Test
-  void shouldFallBackAsync() {
+  @PlaywrightTest
+  void shouldFallBackAsync(Page page, BrowserContext context, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     context.route("**/empty.html", route -> {
       intercepted.add(1);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextServiceWorkerPolicy.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextServiceWorkerPolicy.java
index 351b65199..55e182851 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextServiceWorkerPolicy.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextServiceWorkerPolicy.java
@@ -16,20 +16,20 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.ServiceWorkerPolicy;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class TestBrowserContextServiceWorkerPolicy extends TestBase {
-  @Test
-  void shouldAllowServiceWorkersByDefault() {
+public class TestBrowserContextServiceWorkerPolicy {
+  @PlaywrightTest
+  void shouldAllowServiceWorkersByDefault(Page page, Server server) {
     page.navigate(server.PREFIX + "/serviceworkers/empty/sw.html");
     assertNotNull(page.evaluate("() => window['registrationPromise']"));
   }
 
-  @Test
-  void blocksServiceWorkerRegistration() {
+  @PlaywrightTest
+  void blocksServiceWorkerRegistration(Browser browser, Server server) {
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setServiceWorkers(ServiceWorkerPolicy.BLOCK))) {
       Page page = context.newPage();
       ConsoleMessage message = page.waitForConsoleMessage(new Page.WaitForConsoleMessageOptions()
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
index ffff1dccd..49d7c3862 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStorageState.java
@@ -19,8 +19,9 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.FileInputStream;
@@ -31,15 +32,18 @@
 import java.nio.file.Path;
 
 import static com.microsoft.playwright.Utils.assertJsonEquals;
+import static com.microsoft.playwright.Utils.defaultSameSiteCookieValue;
 import static com.microsoft.playwright.Utils.mapOf;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestBrowserContextStorageState extends TestBase {
+public class TestBrowserContextStorageState {
 
-  @Test
-  void shouldCaptureLocalStorage() {
+  @PlaywrightTest
+  void shouldCaptureLocalStorage(Page page, BrowserContext context) {
     page.route("**/*", route -> {
       route.fulfill(new Route.FulfillOptions().setBody("<html></html>"));
     });
@@ -65,8 +69,8 @@ void shouldCaptureLocalStorage() {
       "}]}", new Gson().fromJson(storageState, JsonObject.class));
   }
 
-  @Test
-  void shouldSetLocalStorage() {
+  @PlaywrightTest
+  void shouldSetLocalStorage(Browser browser) {
     String storageState = "{\n" +
       "  origins: [\n" +
       "    {\n" +
@@ -89,8 +93,8 @@ void shouldSetLocalStorage() {
     context.close();
   }
 
-  @Test
-  void shouldRoundTripThroughTheFile(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  void shouldRoundTripThroughTheFile(BrowserContext context, Browser browser, BrowserName browserName, @TempDir Path tempDir) throws IOException {
     Page page1 = context.newPage();
     page1.route("**/*", route -> {
       route.fulfill(new Route.FulfillOptions().setBody("<html></html>"));
@@ -105,7 +109,7 @@ void shouldRoundTripThroughTheFile(@TempDir Path tempDir) throws IOException {
     context.storageState(new BrowserContext.StorageStateOptions().setPath(path));
 
     String sameSiteCamelCase = "Lax";
-    switch (defaultSameSiteCookieValue) {
+    switch (defaultSameSiteCookieValue(browserName)) {
       case STRICT:
         sameSiteCamelCase = "Strict";
         break;
@@ -151,7 +155,7 @@ void shouldRoundTripThroughTheFile(@TempDir Path tempDir) throws IOException {
     page2.navigate("https://www.example.com");
     Object localStorage = page2.evaluate("window.localStorage");
     assertEquals(mapOf("name1", "value1"), localStorage);
-    if (!isFirefox()) {
+    if (browserName != FIREFOX) {
       // TODO: fails on bots with expected: <username=John Doe> but was: <>
       Object cookie = page2.evaluate("document.cookie");
       assertEquals("username=John Doe", cookie);
@@ -159,8 +163,8 @@ void shouldRoundTripThroughTheFile(@TempDir Path tempDir) throws IOException {
     context2.close();
   }
 
-  @Test
-  void shouldSerialiseStorageStateWithLoneSurrogates() {
+  @PlaywrightTest
+  void shouldSerialiseStorageStateWithLoneSurrogates(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("chars => window.localStorage.setItem('foo', String.fromCharCode(55934))");
     String storageState = context.storageState();
@@ -175,8 +179,8 @@ void shouldSerialiseStorageStateWithLoneSurrogates() {
       "}]}", new Gson().fromJson(storageState, JsonObject.class));
   }
 
-  @Test
-  void shouldSupportIndexedDB() {
+  @PlaywrightTest
+  void shouldSupportIndexedDB(Page page, Browser browser, Server server) {
     page.navigate(server.PREFIX + "/to-do-notifications/index.html");
 
     assertThat(page.locator("#notifications")).matchesAriaSnapshot(
@@ -281,17 +285,17 @@ void shouldSupportIndexedDB() {
       new BrowserContext.StorageStateOptions().setIndexedDB(false)));
   }
 
-  @Test
-  void setStorageStateShouldHandleMissingFile(@TempDir Path tempDir) {
+  @PlaywrightTest
+  void setStorageStateShouldHandleMissingFile(BrowserContext context, @TempDir Path tempDir) {
     Path file = tempDir.resolve("does-not-exist.json");
     PlaywrightException e = org.junit.jupiter.api.Assertions.assertThrows(
       PlaywrightException.class, () -> context.setStorageState(file));
     assertTrue(e.getMessage().contains("Failed to read storage state from file"), e.getMessage());
   }
 
-  @Test
-  void shouldRoundTripOPFS(@TempDir Path tempDir) throws IOException {
-    Assumptions.assumeFalse(isWebKit(), "OPFS is unavailable in non-persistent WebKit contexts");
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "OPFS is unavailable in non-persistent WebKit contexts")
+  void shouldRoundTripOPFS(Page page, BrowserContext context, Browser browser, Server server, @TempDir Path tempDir) throws IOException {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("async () => {\n" +
       "  const root = await navigator.storage.getDirectory();\n" +
@@ -326,7 +330,7 @@ void shouldRoundTripOPFS(@TempDir Path tempDir) throws IOException {
     assertJsonEquals(expected, JsonParser.parseString(context.request().storageState(new APIRequestContext.StorageStateOptions().setOpfs(true))));
 
     try (BrowserContext context2 = browser.newContext(new Browser.NewContextOptions().setStorageStatePath(path))) {
-      checkOPFSContext(context2, expected);
+      checkOPFSContext(server, context2, expected);
     }
 
     try (BrowserContext context3 = browser.newContext()) {
@@ -337,11 +341,11 @@ void shouldRoundTripOPFS(@TempDir Path tempDir) throws IOException {
         "  await root.getFileHandle('stale.txt', { create: true });\n" +
         "}");
       context3.setStorageState(path);
-      checkOPFSContext(context3, expected);
+      checkOPFSContext(server, context3, expected);
     }
   }
 
-  private void checkOPFSContext(BrowserContext context, String expectedStorageState) {
+  private void checkOPFSContext(Server server, BrowserContext context, String expectedStorageState) {
     assertJsonEquals(expectedStorageState, JsonParser.parseString(context.storageState(new BrowserContext.StorageStateOptions().setOpfs(true))));
     Page checkPage = context.newPage();
     checkPage.navigate(server.EMPTY_PAGE);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java
index c107e242a..435cdb244 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java
@@ -16,18 +16,19 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextStrict extends TestBase {
-  @Override
-  BrowserContext createContext() {
-    return browser.newContext(new Browser.NewContextOptions().setStrictSelectors(true));
+public class TestBrowserContextStrict {
+  @Fixture
+  Browser.NewContextOptions contextOptions() {
+    return new Browser.NewContextOptions().setStrictSelectors(true);
   }
 
-  @Test
-  void shouldNotFailPageTextContentInNonStrictMode() {
+  @PlaywrightTest
+  void shouldNotFailPageTextContentInNonStrictMode(Browser browser) {
     try (BrowserContext context = browser.newContext()) {
       Page page = context.newPage();
       page.setContent("<span>span1</span><div><span>target</span></div>");
@@ -35,15 +36,15 @@ void shouldNotFailPageTextContentInNonStrictMode() {
     }
   }
 
-  @Test
-  void shouldFailPageTextContentInStrictMode() {
+  @PlaywrightTest
+  void shouldFailPageTextContentInStrictMode(Page page) {
     page.setContent("<span>span1</span><div><span>target</span></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.textContent("span"));
     assertTrue(e.getMessage().contains("strict mode violation"));
   }
 
-  @Test
-  void shouldOptOutOfStrictMode() {
+  @PlaywrightTest
+  void shouldOptOutOfStrictMode(Page page) {
     page.setContent("<span>span1</span><div><span>target</span></div>");
     assertEquals("span1", page.textContent("span", new Page.TextContentOptions().setStrict(false)));
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextViewport.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextViewport.java
index a55623f4b..23f33070e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextViewport.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextViewport.java
@@ -16,29 +16,29 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.Map;
 
 import static com.microsoft.playwright.Utils.verifyViewport;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextViewport extends TestBase {
+public class TestBrowserContextViewport {
 
-  @Test
-  void shouldGetTheProperDefaultViewPortSize() {
+  @PlaywrightTest
+  void shouldGetTheProperDefaultViewPortSize(Page page) {
     verifyViewport(page, 1280, 720);
   }
 
-  @Test
-  void shouldSetTheProperViewportSize() {
+  @PlaywrightTest
+  void shouldSetTheProperViewportSize(Page page) {
     verifyViewport(page, 1280, 720);
     page.setViewportSize(123, 456);
     verifyViewport(page,123, 456);
   }
 
-  @Test
-  void shouldReturnCorrectOuterWidthAndOuterHeight() {
+  @PlaywrightTest
+  void shouldReturnCorrectOuterWidthAndOuterHeight(Page page) {
     Map<String, Integer> size = (Map<String, Integer>) page.evaluate("() => {\n" +
       "  return {\n" +
       "    innerWidth: window.innerWidth,\n" +
@@ -53,8 +53,8 @@ void shouldReturnCorrectOuterWidthAndOuterHeight() {
     assertTrue(size.get("outerHeight") >= size.get("innerHeight"));
   }
 
-  @Test
-  void shouldEmulateDeviceWidth() {
+  @PlaywrightTest
+  void shouldEmulateDeviceWidth(Page page) {
     verifyViewport(page, 1280, 720);
     page.setViewportSize(200, 200);
     assertEquals(200, page.evaluate("() => window.screen.width"));
@@ -74,8 +74,8 @@ void shouldEmulateDeviceWidth() {
     assertEquals(true, page.evaluate("() => matchMedia('(device-width: 500px)').matches"));
   }
 
-  @Test
-  void shouldEmulateDeviceHeight() {
+  @PlaywrightTest
+  void shouldEmulateDeviceHeight(Page page) {
     verifyViewport(page, 1280, 720);
     page.setViewportSize(200, 200);
     assertEquals(200, page.evaluate("() => window.screen.height"));
@@ -95,23 +95,23 @@ void shouldEmulateDeviceHeight() {
     assertEquals(true, page.evaluate("() => matchMedia('(device-height: 500px)').matches"));
   }
 
-  @Test
-  void shouldEmulateAvailWidthAndAvailHeight() {
+  @PlaywrightTest
+  void shouldEmulateAvailWidthAndAvailHeight(Page page) {
     page.setViewportSize(500, 600);
     assertEquals(500, page.evaluate("() => window.screen.availWidth"));
     assertEquals(600, page.evaluate("() => window.screen.availHeight"));
   }
 
-  @Test
-  void shouldNotHaveTouchByDefault() {
+  @PlaywrightTest
+  void shouldNotHaveTouchByDefault(Page page, Server server) {
     page.navigate(server.PREFIX + "/mobile.html");
     assertEquals(false, page.evaluate("() => 'ontouchstart' in window"));
     page.navigate(server.PREFIX + "/detect-touch.html");
     assertEquals("NO", page.evaluate("() => document.body.textContent.trim()"));
   }
 
-  @Test
-  void shouldSupportTouchWithNullViewport() {
+  @PlaywrightTest
+  void shouldSupportTouchWithNullViewport(Browser browser, Server server) {
     Browser.NewContextOptions options = new Browser.NewContextOptions()
       .setHasTouch(true).setViewportSize(null);
     BrowserContext context = browser.newContext(options);
@@ -121,8 +121,8 @@ void shouldSupportTouchWithNullViewport() {
     context.close();
   }
 
-  @Test
-  void shouldReportNullViewPortSizeWhenGivenNullViewport() {
+  @PlaywrightTest
+  void shouldReportNullViewPortSizeWhenGivenNullViewport(Browser browser) {
     Browser.NewContextOptions options = new Browser.NewContextOptions().setViewportSize(null);
     BrowserContext context = browser.newContext(options);
     Page page = context.newPage();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java
index 9fe4f8d9c..584ac3fe7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextWebAuthn.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.VirtualCredential;
-import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -25,7 +25,7 @@
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserContextWebAuthn extends TestBase {
+public class TestBrowserContextWebAuthn {
   private static final String B64URL_TO_BYTES_JS =
     "  const b64UrlToBytes = s => {\n" +
     "    let str = s.replace(/-/g, '+').replace(/_/g, '/');\n" +
@@ -38,8 +38,8 @@ public class TestBrowserContextWebAuthn extends TestBase {
     "    return u8;\n" +
     "  };\n";
 
-  @Test
-  void shouldNotInterceptNavigatorCredentialsWithoutInstall() {
+  @PlaywrightTest
+  void shouldNotInterceptNavigatorCredentialsWithoutInstall(Page page, BrowserContext context, Server server) {
     // Seed a credential, but do not install the interceptor.
     context.credentials().create("localhost");
     page.navigate(server.EMPTY_PAGE);
@@ -48,8 +48,8 @@ void shouldNotInterceptNavigatorCredentialsWithoutInstall() {
     assertEquals(false, intercepted);
   }
 
-  @Test
-  void shouldSeedKnownCredentialAndAuthenticate() {
+  @PlaywrightTest
+  void shouldSeedKnownCredentialAndAuthenticate(Page page, BrowserContext context, Browser browser, Server server) {
     // This is the easiest way to create credentials. In practice, this
     // probably comes from environment.
     VirtualCredential known;
@@ -133,8 +133,8 @@ private static int assertAndGetSignCount(Page page, String rpId) {
       "}", mapOf("rpId", rpId));
   }
 
-  @Test
-  void shouldSeedAndReportSignCount() {
+  @PlaywrightTest
+  void shouldSeedAndReportSignCount(Page page, BrowserContext context, Browser browser, Server server) {
     VirtualCredential fresh = context.credentials().create("fresh.example.com");
     assertEquals(0, fresh.signCount);
 
@@ -167,16 +167,16 @@ void shouldSeedAndReportSignCount() {
     }
   }
 
-  @Test
-  void shouldRejectInvalidSignCount() {
+  @PlaywrightTest
+  void shouldRejectInvalidSignCount(BrowserContext context) {
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> context.credentials().create("example.com", new Credentials.CreateOptions().setSignCount(-1)));
     assertTrue(e.getMessage().contains("signCount must be between 0 and 4294967295, got -1"), e.getMessage());
     assertEquals(0, context.credentials().get().size());
   }
 
-  @Test
-  void shouldCapturePageCreatedCredentialAndReuseItInAnotherContext() {
+  @PlaywrightTest
+  void shouldCapturePageCreatedCredentialAndReuseItInAnotherContext(Page page, BrowserContext context, Browser browser, Server server) {
     // Setup context: the app registers a passkey via navigator.credentials.create().
     String createdId;
     VirtualCredential captured;
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
index 1d81dd6b1..1d4818fad 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
@@ -16,37 +16,36 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import static com.microsoft.playwright.Utils.getBrowserNameFromEnv;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserTypeBasic extends TestBase {
-  @Test
-  void browserTypeExecutablePathShouldWork() {
-    Assumptions.assumeTrue(getBrowserChannelFromEnv() == null);
-    Assumptions.assumeTrue(createLaunchOptions().executablePath == null, "Skip with custom executable path");
+public class TestBrowserTypeBasic {
+  @PlaywrightTest
+  void browserTypeExecutablePathShouldWork(BrowserType browserType) {
+    Assumptions.assumeTrue(Env.channel() == null);
+    Assumptions.assumeTrue(Env.launchOptions().executablePath == null, "Skip with custom executable path");
     String executablePath = browserType.executablePath();
     assertTrue(Files.exists(Paths.get(executablePath)));
   }
 
-  @Test
-  void browserTypeNameShouldWork() {
-    assertEquals(getBrowserNameFromEnv(), browserType.name());
+  @PlaywrightTest
+  void browserTypeNameShouldWork(BrowserType browserType, BrowserName browserName) {
+    assertEquals(browserName.toString(), browserType.name());
   }
 
-  static boolean isChromiumOrWebKit() {
-    return isChromium() || isWebKit();
-  }
-
-  @Test
-  @DisabledIf(value="isChromiumOrWebKit", disabledReason="Connecting over CDP is supported in Chromium and WebKit")
-  void shouldThrowWhenTryingToConnectWithNotChromium() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = {CHROMIUM, WEBKIT}, reason = "Connecting over CDP is supported in Chromium and WebKit")
+  void shouldThrowWhenTryingToConnectWithNotChromium(BrowserType browserType) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> browserType.connectOverCDP("foo"));
     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 3ee111bf3..9052e384a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
@@ -16,11 +16,11 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import com.microsoft.playwright.fixtures.Scope;
 import com.microsoft.playwright.impl.driver.Driver;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.*;
@@ -35,83 +35,28 @@
 import java.util.stream.Collectors;
 
 import static com.microsoft.playwright.Utils.*;
+import static com.microsoft.playwright.fixtures.Env.isWindows;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestBrowserTypeConnect extends TestBase {
+public class TestBrowserTypeConnect {
   static Path FILE_TO_UPLOAD = Paths.get("src/test/resources/file-to-upload.txt");
 
-  private Process browserServer;
-  private String wsEndpoint;
-
-  static class BrowserServer {
-    Process process;
-    String wsEndpoint;
-
-    void kill() throws InterruptedException {
-      process.destroy();
-      int exitCode = process.waitFor();
-      // FIXME: 2 tests are failing this check on windows:
-      // disconnectedEventShouldBeEmittedWhenBrowserIsClosedOrServerIsClosed
-      // shouldThrowWhenUsedAfterIsConnectedReturnsFalse
-      if (!isWindows) {
-        assertEquals(0, exitCode);
-      }
-    }
+  @Fixture(scope = Scope.WORKER)
+  static BrowserServer browserServer(BrowserType browserType) {
+    return BrowserServer.launch(browserType);
   }
 
-  static BrowserServer launchBrowserServer(BrowserType browserType) {
-    try {
-      Driver driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
-      Path dir = driver.driverDir();
-      String node = dir.resolve(isWindows ? "node.exe" : "node").toString();
-      String cliJs = dir.resolve("package/cli.js").toString();
-      // We launch node process directly instead of using playwright.sh script as killing the script
-      // process will leave node process running and killing it would be more hassle.
-      ProcessBuilder pb = new ProcessBuilder(node, cliJs, "launch-server", "--browser", browserType.name());
-      pb.directory(dir.toFile());
-      pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-      BrowserServer result = new BrowserServer();
-      result.process = pb.start();
-      BufferedReader input =  new BufferedReader(new InputStreamReader(result.process.getInputStream()));
-      result.wsEndpoint = input.readLine();
-      if (!result.wsEndpoint.startsWith("ws://")) {
-        throw new RuntimeException("Invalid web socket address: " + result.wsEndpoint);
-      }
-      return result;
-    } catch (IOException e) {
-      throw new PlaywrightException("Failed to launch server", e);
-    }
-  }
-
-  @Override
-  @BeforeAll
-  // Hide base class method to launch browser server and connect to it.
-  void launchBrowser() {
-    initBrowserType();
-    BrowserServer r = launchBrowserServer(browserType);
-    wsEndpoint = r.wsEndpoint;
-    browserServer = r.process;
-    browser = browserType.connect(wsEndpoint);
-    // Do not actually connect to browser, the tests will do it manually.
-  }
-
-  @Override
-  @AfterAll
-  void closeBrowser() {
-    super.closeBrowser();
-    if (browserServer != null) {
-      browserServer.destroyForcibly();
-      browserServer = null;
-      wsEndpoint = null;
-    }
+  @Fixture(scope = Scope.WORKER)
+  static Browser browser(BrowserType browserType, BrowserServer browserServer) {
+    return browserType.connect(browserServer.wsEndpoint);
   }
 
-  @Test
-  void shouldBeAbleToReconnectToABrowser() {
+  @PlaywrightTest
+  void shouldBeAbleToReconnectToABrowser(BrowserType browserType, Server server, BrowserServer browserServer) {
     {
-      Browser browser = browserType.connect(wsEndpoint);
+      Browser browser = browserType.connect(browserServer.wsEndpoint);
       BrowserContext browserContext = browser.newContext();
       assertEquals(0, browserContext.pages().size());
       Page page = browserContext.newPage();
@@ -120,7 +65,7 @@ void shouldBeAbleToReconnectToABrowser() {
       browser.close();
     }
     {
-      Browser browser = browserType.connect(wsEndpoint);
+      Browser browser = browserType.connect(browserServer.wsEndpoint);
       BrowserContext browserContext = browser.newContext();
       Page page = browserContext.newPage();
       page.navigate(server.EMPTY_PAGE);
@@ -128,9 +73,9 @@ void shouldBeAbleToReconnectToABrowser() {
     }
   }
 
-  @Test
-  void shouldSupportSlowMo() {
-    Browser browser = browserType.connect(wsEndpoint,
+  @PlaywrightTest
+  void shouldSupportSlowMo(BrowserType browserType, Server server, BrowserServer browserServer) {
+    Browser browser = browserType.connect(browserServer.wsEndpoint,
       new BrowserType.ConnectOptions().setSlowMo(1));
     BrowserContext browserContext = browser.newContext();
     Page page = browserContext.newPage();
@@ -139,14 +84,14 @@ void shouldSupportSlowMo() {
     browser.close();
   }
 
-  @Test
-  void shouldBeAbleToConnectTwoBrowsersAtTheSameTime() {
-    Browser browser1 = browserType.connect(wsEndpoint);
+  @PlaywrightTest
+  void shouldBeAbleToConnectTwoBrowsersAtTheSameTime(BrowserType browserType, BrowserServer browserServer) {
+    Browser browser1 = browserType.connect(browserServer.wsEndpoint);
     assertEquals(0, browser1.contexts().size());
     browser1.newContext();
     assertEquals(1, browser1.contexts().size());
 
-    Browser browser2 = browserType.connect(wsEndpoint);
+    Browser browser2 = browserType.connect(browserServer.wsEndpoint);
     assertEquals(0, browser2.contexts().size());
     browser2.newContext();
     assertEquals(1, browser2.contexts().size());
@@ -159,8 +104,8 @@ void shouldBeAbleToConnectTwoBrowsersAtTheSameTime() {
     browser2.close();
   }
 
-  @Test
-  void shouldSendExtraHeadersWithConnectRequest() throws Exception {
+  @PlaywrightTest
+  void shouldSendExtraHeadersWithConnectRequest(BrowserType browserType) throws Exception {
     try (WebSocketServerImpl webSocketServer = WebSocketServerImpl.create()) {
       try {
         browserType.connect("ws://localhost:" + webSocketServer.getPort() + "/ws",
@@ -174,10 +119,10 @@ void shouldSendExtraHeadersWithConnectRequest() throws Exception {
     }
   }
 
-  @Test
-  void disconnectedEventShouldBeEmittedWhenBrowserIsClosedOrServerIsClosed() throws InterruptedException {
+  @PlaywrightTest
+  void disconnectedEventShouldBeEmittedWhenBrowserIsClosedOrServerIsClosed(BrowserType browserType) throws InterruptedException {
     // Launch another server to not affect other tests.
-    BrowserServer remote = launchBrowserServer(browserType);
+    BrowserServer remote = BrowserServer.launch(browserType);
 
     Browser browser1 = browserType.connect(remote.wsEndpoint);
     Browser browser2 = browserType.connect(remote.wsEndpoint);
@@ -200,9 +145,9 @@ void disconnectedEventShouldBeEmittedWhenBrowserIsClosedOrServerIsClosed() throw
     assertEquals(1, disconnected2[0]);
   }
 
-  @Test
-  void disconnectedEventShouldHaveBrowserAsArgument() {
-    Browser browser = browserType.connect(wsEndpoint);
+  @PlaywrightTest
+  void disconnectedEventShouldHaveBrowserAsArgument(BrowserType browserType, BrowserServer browserServer) {
+    Browser browser = browserType.connect(browserServer.wsEndpoint);
     Browser[] disconnected = {null};
     browser.onDisconnected(b -> disconnected[0] = b);
     browser.close();
@@ -213,18 +158,18 @@ void shouldHandleExceptionsDuringConnect() {
     // This is an implementation detail test
   }
 
-  @Test
-  void shouldSetTheBrowserConnectedState() {
-    Browser remote = browserType.connect(wsEndpoint);
+  @PlaywrightTest
+  void shouldSetTheBrowserConnectedState(BrowserType browserType, BrowserServer browserServer) {
+    Browser remote = browserType.connect(browserServer.wsEndpoint);
     assertTrue(remote.isConnected());
     remote.close();
     assertFalse(remote.isConnected());
   }
 
-  @Test
-  void shouldThrowWhenUsedAfterIsConnectedReturnsFalse() throws InterruptedException {
+  @PlaywrightTest
+  void shouldThrowWhenUsedAfterIsConnectedReturnsFalse(BrowserType browserType) throws InterruptedException {
     // Launch another server to not affect other tests.
-    BrowserServer server = launchBrowserServer(browserType);
+    BrowserServer server = BrowserServer.launch(browserType);
     Browser remote = browserType.connect(server.wsEndpoint);
     Page page = remote.newPage();
     boolean[] disconnected = {false};
@@ -242,9 +187,9 @@ void shouldThrowWhenUsedAfterIsConnectedReturnsFalse() throws InterruptedExcepti
     assertFalse(remote.isConnected());
   }
 
-  @Test
-  void shouldThrowWhenCallingWaitForNavigationAfterDisconnect() throws InterruptedException {
-    BrowserServer server = launchBrowserServer(browserType);
+  @PlaywrightTest
+  void shouldThrowWhenCallingWaitForNavigationAfterDisconnect(BrowserType browserType) throws InterruptedException {
+    BrowserServer server = BrowserServer.launch(browserType);
     Browser browser = browserType.connect(server.wsEndpoint);
     Page page = browser.newPage();
 
@@ -266,9 +211,9 @@ void shouldThrowWhenCallingWaitForNavigationAfterDisconnect() throws Interrupted
       e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
-  void shouldRejectNavigationWhenBrowserCloses() {
-    Browser remote = browserType.connect(wsEndpoint);
+  @PlaywrightTest
+  void shouldRejectNavigationWhenBrowserCloses(BrowserType browserType, Server server, BrowserServer browserServer) {
+    Browser remote = browserType.connect(browserServer.wsEndpoint);
     Page page = remote.newPage();
 
     server.setRoute("/one-style.css", r -> {});
@@ -279,9 +224,9 @@ void shouldRejectNavigationWhenBrowserCloses() {
     assertTrue(e.getMessage().contains("Browser has been closed"));
   }
 
-  @Test
-  void shouldEmitCloseEventsOnPagesAndContexts() throws InterruptedException {
-    BrowserServer server = launchBrowserServer(browserType);
+  @PlaywrightTest
+  void shouldEmitCloseEventsOnPagesAndContexts(BrowserType browserType) throws InterruptedException {
+    BrowserServer server = BrowserServer.launch(browserType);
     Browser browser = browserType.connect(server.wsEndpoint);
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
@@ -300,8 +245,8 @@ void shouldEmitCloseEventsOnPagesAndContexts() throws InterruptedException {
     assertEquals(Arrays.asList("page", "context"), events);
   }
 
-  @Test
-  void shouldRespectSelectors() {
+  @PlaywrightTest
+  void shouldRespectSelectors(BrowserType browserType, Playwright playwright, BrowserServer browserServer) {
     String mycss = "{\n" +
       "    query(root, selector) {\n" +
       "      return root.querySelector(selector);\n" +
@@ -313,7 +258,7 @@ void shouldRespectSelectors() {
     // Register one engine before connecting.
     playwright.selectors().register("mycss1", mycss);
 
-    Browser browser1 = browserType.connect(wsEndpoint);
+    Browser browser1 = browserType.connect(browserServer.wsEndpoint);
     BrowserContext context1 = browser1.newContext();
 
     // Register another engine after creating context.
@@ -325,7 +270,7 @@ void shouldRespectSelectors() {
     assertEquals("hello", page1.innerHTML("mycss1=div"));
     assertEquals("hello", page1.innerHTML("mycss2=div"));
 
-    Browser browser2 = browserType.connect(wsEndpoint);
+    Browser browser2 = browserType.connect(browserServer.wsEndpoint);
 
     // Register third engine after second connect.
     playwright.selectors().register("mycss3", mycss);
@@ -341,9 +286,9 @@ void shouldRespectSelectors() {
     browser2.close();
   }
 
-  @Test
-  void shouldNotThrowOnCloseAfterDisconnect() throws InterruptedException {
-    BrowserServer remoteServer = launchBrowserServer(browserType);
+  @PlaywrightTest
+  void shouldNotThrowOnCloseAfterDisconnect(BrowserType browserType) throws InterruptedException {
+    BrowserServer remoteServer = BrowserServer.launch(browserType);
     Browser browser = browserType.connect(remoteServer.wsEndpoint);
     Page page = browser.newPage();
 
@@ -357,8 +302,8 @@ void shouldNotThrowOnCloseAfterDisconnect() throws InterruptedException {
     browser.close();
   }
 
-  @Test
-  void shouldSaveAsVideosFromRemoteBrowser(@TempDir Path tempDir) {
+  @PlaywrightTest
+  void shouldSaveAsVideosFromRemoteBrowser(Browser browser, @TempDir Path tempDir) {
     Path videosPath = tempDir.resolve("videosPath");
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setRecordVideoDir(videosPath).setRecordVideoSize(320,  240));
@@ -374,8 +319,8 @@ void shouldSaveAsVideosFromRemoteBrowser(@TempDir Path tempDir) {
   }
 
 
-  @Test
-  void shouldSaveDownload(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  void shouldSaveDownload(Browser browser, Server server, @TempDir Path tempDir) throws IOException {
     server.setRoute("/download", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "application/octet-stream");
       exchange.getResponseHeaders().add("Content-Disposition", "attachment");
@@ -397,8 +342,8 @@ void shouldSaveDownload(@TempDir Path tempDir) throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldErrorWhenSavingDownloadAfterDeletion(@TempDir Path tempDir) {
+  @PlaywrightTest
+  void shouldErrorWhenSavingDownloadAfterDeletion(Browser browser, Server server, @TempDir Path tempDir) {
     server.setRoute("/download", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "application/octet-stream");
       exchange.getResponseHeaders().add("Content-Disposition", "attachment");
@@ -417,11 +362,9 @@ void shouldErrorWhenSavingDownloadAfterDeletion(@TempDir Path tempDir) {
     page.close();
   }
 
-  @Test
-  void shouldSupportTracingOverWebSocket(@TempDir Path tempDir) throws IOException {
-    List<BrowserContext> contexts = browser.contexts();
-    assertEquals(1, contexts.size());
-    BrowserContext context = contexts.get(0);
+  @PlaywrightTest
+  void shouldSupportTracingOverWebSocket(Browser browser, BrowserContext context, Server server, @TempDir Path tempDir) throws IOException {
+    assertEquals(asList(context), browser.contexts());
 
     Page page = context.newPage();
     context.tracing().start(new Tracing.StartOptions().setName("test")
@@ -437,8 +380,8 @@ void shouldSupportTracingOverWebSocket(@TempDir Path tempDir) throws IOException
     assertTrue(Files.size(traceFile) > 0);
   }
 
-  @Test
-  void shouldRecordTraceWithSources(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldRecordTraceWithSources(Page page, BrowserContext context, Server server, @TempDir Path tmpDir) throws IOException {
     Assumptions.assumeTrue(System.getenv("PLAYWRIGHT_JAVA_SRC") != null, "PLAYWRIGHT_JAVA_SRC must point to the directory containing this test source.");
     context.tracing().start(new Tracing.StartOptions().setSources(true));
     page.navigate(server.EMPTY_PAGE);
@@ -457,8 +400,8 @@ void shouldRecordTraceWithSources(@TempDir Path tmpDir) throws IOException {
     assertEquals(new String(thisFile, UTF_8), new String(sources.values().iterator().next(), UTF_8));
   }
 
-  @Test
-  void shouldFulfillWithGlobalFetchResult() {
+  @PlaywrightTest
+  void shouldFulfillWithGlobalFetchResult(Page page, Playwright playwright, Server server) {
     page.route("**/*", route -> {
       APIRequestContext request = playwright.request().newContext();
       APIResponse response = request.get(server.PREFIX + "/simple.json");
@@ -469,8 +412,8 @@ void shouldFulfillWithGlobalFetchResult() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldUploadLargeFile(Page page, Server server, @TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
     Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
     page.navigate(server.PREFIX + "/input/fileupload.html");
     Path uploadFile = tmpDir.resolve("200MB.zip");
@@ -509,8 +452,8 @@ void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionEx
     assertEquals(200 * 1024 * 1024, fields.get(0).content.length());
   }
 
-  @Test
-  void setInputFilesShouldPreserveLastModifiedTimestamp() throws IOException {
+  @PlaywrightTest
+  void setInputFilesShouldPreserveLastModifiedTimestamp(Page page) throws IOException {
     page.setContent("<input type=file multiple=true/>");
     Locator input = page.locator("input");
     input.setInputFiles(FILE_TO_UPLOAD);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestCheck.java b/playwright/src/test/java/com/microsoft/playwright/TestCheck.java
index 12928f762..01471c524 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestCheck.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestCheck.java
@@ -16,64 +16,64 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestCheck extends TestBase {
+public class TestCheck {
 
-  @Test
-  void shouldCheckTheBox() {
+  @PlaywrightTest
+  void shouldCheckTheBox(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     page.check("input");
     assertTrue((Boolean) page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldNotCheckTheCheckedBox() {
+  @PlaywrightTest
+  void shouldNotCheckTheCheckedBox(Page page) {
     page.setContent("<input id='checkbox' type='checkbox' checked></input>");
     page.check("input");
     assertTrue((Boolean) page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldUncheckTheBox() {
+  @PlaywrightTest
+  void shouldUncheckTheBox(Page page) {
     page.setContent("<input id='checkbox' type='checkbox' checked></input>");
     page.uncheck("input");
     assertEquals(false, page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldNotUncheckTheUncheckedBox() {
+  @PlaywrightTest
+  void shouldNotUncheckTheUncheckedBox(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     page.uncheck("input");
     assertEquals(false, page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldCheckTheBoxByLabel() {
+  @PlaywrightTest
+  void shouldCheckTheBoxByLabel(Page page) {
     page.setContent("<label for='checkbox'><input id='checkbox' type='checkbox'></input></label>");
     page.check("label");
     assertTrue((Boolean) page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldCheckTheBoxOutsideLabel() {
+  @PlaywrightTest
+  void shouldCheckTheBoxOutsideLabel(Page page) {
     page.setContent("<label for='checkbox'>Text</label><div><input id='checkbox' type='checkbox'></input></div>");
     page.check("label");
     assertTrue((Boolean) page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldCheckTheBoxInsideLabelWOId() {
+  @PlaywrightTest
+  void shouldCheckTheBoxInsideLabelWOId(Page page) {
     page.setContent("<label>Text<span><input id='checkbox' type='checkbox'></input></span></label>");
     page.check("label");
     assertTrue((Boolean) page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldCheckRadio() {
+  @PlaywrightTest
+  void shouldCheckRadio(Page page) {
     page.setContent("<input type='radio'>one</input>\n" +
       "<input id='two' type='radio'>two</input>\n" +
       "<input type='radio'>three</input>");
@@ -81,8 +81,8 @@ void shouldCheckRadio() {
     assertTrue((Boolean) page.evaluate("() => window['two'].checked"));
   }
 
-  @Test
-  void shouldCheckTheBoxByAriaRole() {
+  @PlaywrightTest
+  void shouldCheckTheBoxByAriaRole(Page page) {
     page.setContent("<div role='checkbox' id='checkbox'>CHECKBOX</div>\n" +
       " <script>\n" +
       "  checkbox.addEventListener('click', () => checkbox.setAttribute('aria-checked', 'true'));\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestChromium.java b/playwright/src/test/java/com/microsoft/playwright/TestChromium.java
index 74d2d7f7f..70f2e6ff2 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestChromium.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestChromium.java
@@ -18,8 +18,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -33,16 +34,12 @@
 import java.util.List;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-@EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Chromium-specific API")
-public class TestChromium extends TestBase {
-  @Override
-  void createContextAndPage() {
-    // Do not create anything.
-  }
-
+@EnabledOnBrowser(value = CHROMIUM, reason = "Chromium-specific API")
+public class TestChromium {
   private int nextPort = 9339;
 
   private static String wsEndpointFromUrl(String urlString) throws IOException {
@@ -54,10 +51,10 @@ private static String wsEndpointFromUrl(String urlString) throws IOException {
     return json.get("webSocketDebuggerUrl").getAsString();
   }
 
-  @Test
-  void shouldConnectToAnExistingCdpSession() throws IOException {
+  @PlaywrightTest
+  void shouldConnectToAnExistingCdpSession(BrowserType browserType) throws IOException {
     int port = nextPort++;
-    try (Browser browserServer = browserType.launch(createLaunchOptions()
+    try (Browser browserServer = browserType.launch(Env.launchOptions()
         .setArgs(asList("--remote-debugging-port=" + port)))) {
       Browser cdpBrowser = browserType.connectOverCDP("http://localhost:" + port);
       List<BrowserContext> contexts = cdpBrowser.contexts();
@@ -66,10 +63,10 @@ void shouldConnectToAnExistingCdpSession() throws IOException {
     }
   }
 
-  @Test
-  void shouldConnectToAnExistingCdpSessionTwice() throws IOException {
+  @PlaywrightTest
+  void shouldConnectToAnExistingCdpSessionTwice(BrowserType browserType, Server server) throws IOException {
     int port = nextPort++;
-    try (Browser browserServer = browserType.launch(createLaunchOptions()
+    try (Browser browserServer = browserType.launch(Env.launchOptions()
         .setArgs(asList("--remote-debugging-port=" + port)))) {
       String endpointUrl = "http://localhost:" + port;
       Browser cdpBrowser1 = browserType.connectOverCDP(endpointUrl);
@@ -92,10 +89,10 @@ void shouldConnectToAnExistingCdpSessionTwice() throws IOException {
     }
   }
 
-  @Test
-  void shouldConnectOverAWsEndpoint() throws IOException {
+  @PlaywrightTest
+  void shouldConnectOverAWsEndpoint(BrowserType browserType) throws IOException {
     int port = nextPort++;
-    try (Browser browserServer = browserType.launch(createLaunchOptions()
+    try (Browser browserServer = browserType.launch(Env.launchOptions()
         .setArgs(asList("--remote-debugging-port=" + port)))) {
       String wsEndpoint = wsEndpointFromUrl("http://localhost:" + port + "/json/version/");
 
@@ -111,8 +108,8 @@ void shouldConnectOverAWsEndpoint() throws IOException {
     }
   }
 
-  @Test
-  void shouldSendExtraHeadersWithConnectRequest() throws Exception {
+  @PlaywrightTest
+  void shouldSendExtraHeadersWithConnectRequest(BrowserType browserType) throws Exception {
     try (WebSocketServerImpl webSocketServer = WebSocketServerImpl.create()) {
       try {
         browserType.connectOverCDP("ws://localhost:" + webSocketServer.getPort() + "/ws",
@@ -125,10 +122,10 @@ void shouldSendExtraHeadersWithConnectRequest() throws Exception {
     }
   }
 
-  @Test
-  void shouldSupportTracingOverCDP(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  void shouldSupportTracingOverCDP(BrowserType browserType, Server server, @TempDir Path tempDir) throws IOException {
     int port = nextPort++;
-    try (Browser browserServer = browserType.launch(createLaunchOptions()
+    try (Browser browserServer = browserType.launch(Env.launchOptions()
       .setArgs(asList("--remote-debugging-port=" + port)))) {
       try (Browser cdpBrowser = browserType.connectOverCDP("http://localhost:" + port)) {
         List<BrowserContext> contexts = cdpBrowser.contexts();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java b/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java
index ef89f3f61..b6fc0e351 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java
@@ -18,8 +18,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.FileReader;
@@ -28,13 +28,14 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-@EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Chromium-only API")
-public class TestChromiumTracing extends TestBase {
-  @Test
-  void shouldOutputATrace(@TempDir Path tempDir) {
+@EnabledOnBrowser(value = CHROMIUM, reason = "Chromium-only API")
+public class TestChromiumTracing {
+  @PlaywrightTest
+  void shouldOutputATrace(Browser browser, Server server, @TempDir Path tempDir) {
     try (Page page = browser.newPage()) {
       Path outputTraceFile = tempDir.resolve("trace.json");
       browser.startTracing(page, new Browser.StartTracingOptions()
@@ -45,8 +46,8 @@ void shouldOutputATrace(@TempDir Path tempDir) {
     }
   }
 
-  @Test
-  void shouldCreateDirectoriesAsNeeded(@TempDir Path tempDir) {
+  @PlaywrightTest
+  void shouldCreateDirectoriesAsNeeded(Browser browser, Server server, @TempDir Path tempDir) {
     try (Page page = browser.newPage()) {
       Path filePath = tempDir.resolve("these/are/directories/trace.json");
       browser.startTracing(page, new Browser.StartTracingOptions()
@@ -63,8 +64,8 @@ private static void rafraf(Page page, int count) {
     }
   }
 
-  @Test
-  void shouldRunWithCustomCategoriesIfProvided(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  void shouldRunWithCustomCategoriesIfProvided(Browser browser, @TempDir Path tempDir) throws IOException {
     try (Page page = browser.newPage()) {
       Path outputTraceFile = tempDir.resolve("trace.json");
       browser.startTracing(page, new Browser.StartTracingOptions()
@@ -89,8 +90,8 @@ void shouldRunWithCustomCategoriesIfProvided(@TempDir Path tempDir) throws IOExc
     }
   }
 
-  @Test
-  void shouldThrowIfTracingOnTwoPages(@TempDir Path tempDir) {
+  @PlaywrightTest
+  void shouldThrowIfTracingOnTwoPages(Browser browser, @TempDir Path tempDir) {
     try (Page page = browser.newPage()) {
       Path outputTraceFile = tempDir.resolve("trace.json");
       browser.startTracing(page, new Browser.StartTracingOptions()
@@ -105,8 +106,8 @@ void shouldThrowIfTracingOnTwoPages(@TempDir Path tempDir) {
     }
   }
 
-  @Test
-  void shouldReturnABuffer(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  void shouldReturnABuffer(Browser browser, Server server, @TempDir Path tempDir) throws IOException {
     try (Page page = browser.newPage()) {
       Path outputTraceFile = tempDir.resolve("trace.json");
       browser.startTracing(page, new Browser.StartTracingOptions()
@@ -118,8 +119,8 @@ void shouldReturnABuffer(@TempDir Path tempDir) throws IOException {
     }
   }
 
-  @Test
-  void shouldWorkWithoutOptions() {
+  @PlaywrightTest
+  void shouldWorkWithoutOptions(Browser browser, Server server) {
     try (Page page = browser.newPage()) {
       browser.startTracing(page);
       page.navigate(server.PREFIX + "/grid.html");
@@ -128,8 +129,8 @@ void shouldWorkWithoutOptions() {
     }
   }
 
-  @Test
-  void shouldSupportABufferWithoutAPath() {
+  @PlaywrightTest
+  void shouldSupportABufferWithoutAPath(Browser browser, Server server) {
     try (Page page = browser.newPage()) {
       browser.startTracing(page, new Browser.StartTracingOptions().setScreenshots(true));
       page.navigate(server.PREFIX + "/grid.html");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClick.java b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
index 4c9086c89..a3841fd9d 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
@@ -16,30 +16,31 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static com.microsoft.playwright.options.KeyboardModifier.SHIFT;
 import static com.microsoft.playwright.options.MouseButton.RIGHT;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestClick extends TestBase {
+public class TestClick {
 
-  @Test
-  void shouldClickTheButton() {
+  @PlaywrightTest
+  void shouldClickTheButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.click("button");
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldClickSvg() {
+  @PlaywrightTest
+  void shouldClickSvg(Page page) {
     page.setContent("<svg height='100' width='100'>\n" +
       "<circle onclick='javascript:window.__CLICKED=42' cx='50' cy='50' r='40' stroke='black' stroke-width='3' fill='red'/>\n" +
       "</svg>\n");
@@ -47,8 +48,8 @@ void shouldClickSvg() {
     assertEquals(42, page.evaluate("__CLICKED"));
   }
 
-  @Test
-  void shouldClickTheButtonIfWindowNodeIsRemoved() {
+  @PlaywrightTest
+  void shouldClickTheButtonIfWindowNodeIsRemoved(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => delete window.Node");
     page.click("button");
@@ -56,8 +57,8 @@ void shouldClickTheButtonIfWindowNodeIsRemoved() {
   }
 
   // @see https://github.com/GoogleChrome/puppeteer/issues/4281
-  @Test
-  void shouldClickOnASpanWithAnInlineElementInside() {
+  @PlaywrightTest
+  void shouldClickOnASpanWithAnInlineElementInside(Page page) {
     page.setContent(
       "<style>\n" +
         "  span::before {\n" +
@@ -73,15 +74,15 @@ void shouldNotThrowUnhandledPromiseRejectionWhenPageCloses() {
     // not supported in sync api
   }
 
-  @Test
-  void shouldClickThe1x1Div() {
+  @PlaywrightTest
+  void shouldClickThe1x1Div(Page page) {
     page.setContent("<div style='width: 1px; height: 1px;' onclick='window.__clicked = true'></div>");
     page.click("div");
     assertTrue((Boolean) page.evaluate("window.__clicked"));
   }
 
-  @Test
-  void shouldClickTheButtonAfterNavigation() {
+  @PlaywrightTest
+  void shouldClickTheButtonAfterNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.click("button");
     page.navigate(server.PREFIX + "/input/button.html");
@@ -89,8 +90,8 @@ void shouldClickTheButtonAfterNavigation() {
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldClickTheButtonAfterACrossOriginNavigation() {
+  @PlaywrightTest
+  void shouldClickTheButtonAfterACrossOriginNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.click("button");
     page.navigate(server.CROSS_PROCESS_PREFIX + "/input/button.html");
@@ -98,8 +99,8 @@ void shouldClickTheButtonAfterACrossOriginNavigation() {
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldClickWithDisabledJavascript() {
+  @PlaywrightTest
+  void shouldClickWithDisabledJavascript(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setJavaScriptEnabled(false));
     Page page = context.newPage();
     page.navigate(server.PREFIX + "/wrappedlink.html");
@@ -110,8 +111,8 @@ void shouldClickWithDisabledJavascript() {
     context.close();
   }
 
-  @Test
-  void shouldClickWhenOneOfInlineBoxChildrenIsOutsideOfViewport() {
+  @PlaywrightTest
+  void shouldClickWhenOneOfInlineBoxChildrenIsOutsideOfViewport(Page page) {
     page.setContent(
       "<style>\n" +
         "i {\n" +
@@ -124,8 +125,8 @@ void shouldClickWhenOneOfInlineBoxChildrenIsOutsideOfViewport() {
     assertEquals(42, page.evaluate("CLICKED"));
   }
 
-  @Test
-  void shouldSelectTheTextByTripleClicking() {
+  @PlaywrightTest
+  void shouldSelectTheTextByTripleClicking(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     String text = "This is the text that we are going to try to select. Let's see how it goes.";
     page.fill("textarea", text);
@@ -136,8 +137,8 @@ void shouldSelectTheTextByTripleClicking() {
       "}"));
   }
 
-  @Test
-  void shouldClickOffscreenButtons() {
+  @PlaywrightTest
+  void shouldClickOffscreenButtons(Page page, Server server) {
     page.navigate(server.PREFIX + "/offscreenbuttons.html");
     List<String> messages = new ArrayList<>();
     page.onConsoleMessage(message -> messages.add(message.text()));
@@ -161,15 +162,15 @@ void shouldClickOffscreenButtons() {
     ), messages);
   }
 
-  @Test
-  void shouldWaitForVisibleWhenAlreadyVisible() {
+  @PlaywrightTest
+  void shouldWaitForVisibleWhenAlreadyVisible(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.click("button");
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldNotWaitWithForce() {
+  @PlaywrightTest
+  void shouldNotWaitWithForce(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evalOnSelector("button", "b => b.style.display = 'none'");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -191,15 +192,15 @@ void shouldWaitForVisibleWhenParentIsHidden() {
     // not supported in sync api
   }
 
-  @Test
-  void shouldClickWrappedLinks() {
+  @PlaywrightTest
+  void shouldClickWrappedLinks(Page page, Server server) {
     page.navigate(server.PREFIX + "/wrappedlink.html");
     page.click("a");
     assertTrue((Boolean) page.evaluate("__clicked"));
   }
 
-  @Test
-  void shouldClickOnCheckboxInputAndToggle() {
+  @PlaywrightTest
+  void shouldClickOnCheckboxInputAndToggle(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/checkbox.html");
     assertNull(page.evaluate("() => window['result'].check"));
     page.click("input#agree");
@@ -218,8 +219,8 @@ void shouldClickOnCheckboxInputAndToggle() {
     assertFalse((Boolean) page.evaluate("() => window['result'].check"));
   }
 
-  @Test
-  void shouldClickOnCheckboxLabelAndToggle() {
+  @PlaywrightTest
+  void shouldClickOnCheckboxLabelAndToggle(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/checkbox.html");
     assertNull(page.evaluate("() => window['result'].check"));
     page.click("label[for='agree']");
@@ -233,8 +234,8 @@ void shouldClickOnCheckboxLabelAndToggle() {
     assertFalse((Boolean) page.evaluate("() => window['result'].check"));
   }
 
-  @Test
-  void shouldNotHangWithTouchEnabledViewports() {
+  @PlaywrightTest
+  void shouldNotHangWithTouchEnabledViewports(Browser browser) {
     // @see https://github.com/GoogleChrome/puppeteer/issues/161
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(375, 667)
@@ -246,8 +247,8 @@ void shouldNotHangWithTouchEnabledViewports() {
     context.close();
   }
 
-  @Test
-  void shouldScrollAndClickTheButton() {
+  @PlaywrightTest
+  void shouldScrollAndClickTheButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/scrollable.html");
     page.click("#button-5");
     assertEquals("clicked", page.evaluate("() => document.querySelector('#button-5').textContent"));
@@ -255,8 +256,8 @@ void shouldScrollAndClickTheButton() {
     assertEquals("clicked", page.evaluate("() => document.querySelector('#button-80').textContent"));
   }
 
-  @Test
-  void shouldDoubleClickTheButton() {
+  @PlaywrightTest
+  void shouldDoubleClickTheButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => {\n" +
       "  window['double'] = false;\n" +
@@ -270,8 +271,8 @@ void shouldDoubleClickTheButton() {
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldClickAPartiallyObscuredButton() {
+  @PlaywrightTest
+  void shouldClickAPartiallyObscuredButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => {\n" +
       "  const button = document.querySelector('button');\n" +
@@ -283,30 +284,30 @@ void shouldClickAPartiallyObscuredButton() {
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldClickARotatedButton() {
+  @PlaywrightTest
+  void shouldClickARotatedButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/rotatedButton.html");
     page.click("button");
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldFireContextmenuEventOnRightClick() {
+  @PlaywrightTest
+  void shouldFireContextmenuEventOnRightClick(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/scrollable.html");
     page.click("#button-8", new Page.ClickOptions().setButton(RIGHT));
     assertEquals("context menu", page.evaluate("() => document.querySelector('#button-8').textContent"));
   }
 
-  @Test
-  void shouldClickLinksWhichCauseNavigation() {
+  @PlaywrightTest
+  void shouldClickLinksWhichCauseNavigation(Page page, Server server) {
     // @see https://github.com/GoogleChrome/puppeteer/issues/206
     page.setContent("<a href=" + server.EMPTY_PAGE + ">empty.html</a>");
     // This should not hang.
     page.click("a");
   }
 
-  @Test
-  void shouldClickTheButtonInsideAnIframe() {
+  @PlaywrightTest
+  void shouldClickTheButtonInsideAnIframe(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<div style='width:100px;height:100px'>spacer</div>");
     Utils.attachFrame(page, "button-test", server.PREFIX + "/input/button.html");
@@ -316,9 +317,9 @@ void shouldClickTheButtonInsideAnIframe() {
     assertEquals("Clicked", frame.evaluate("() => window['result']"));
   }
 
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="fixme")
-  void shouldClickTheButtonWithFixedPositionInsideAnIframe() {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = FIREFOX, reason = "fixme")
+  void shouldClickTheButtonWithFixedPositionInsideAnIframe(Page page, Server server) {
     // @see https://github.com/GoogleChrome/puppeteer/issues/4110
     // @see https://bugs.chromium.org/p/chromium/issues/detail?id=986390
     // @see https://chromium-review.googlesource.com/c/chromium/src/+/1742784
@@ -333,8 +334,8 @@ void shouldClickTheButtonWithFixedPositionInsideAnIframe() {
   }
 
 
-  @Test
-  void shouldClickTheButtonWithDeviceScaleFactorSet() {
+  @PlaywrightTest
+  void shouldClickTheButtonWithDeviceScaleFactorSet(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(400, 400)
       .setDeviceScaleFactor(5.0));
@@ -349,8 +350,8 @@ void shouldClickTheButtonWithDeviceScaleFactorSet() {
     context.close();
   }
 
-  @Test
-  void shouldClickTheButtonWithPxBorderWithOffset() {
+  @PlaywrightTest
+  void shouldClickTheButtonWithPxBorderWithOffset(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evalOnSelector("button", "button => button.style.borderWidth = '8px'");
     page.click("button", new Page.ClickOptions().setPosition(20, 10));
@@ -359,8 +360,8 @@ void shouldClickTheButtonWithPxBorderWithOffset() {
     assertEquals(10, page.evaluate("offsetY"));
   }
 
-  @Test
-  void shouldClickTheButtonWithEmBorderWithOffset() {
+  @PlaywrightTest
+  void shouldClickTheButtonWithEmBorderWithOffset(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evalOnSelector("button", "button => button.style.borderWidth = '2em'");
     page.evalOnSelector("button", "button => button.style.fontSize = '12px'");
@@ -370,8 +371,8 @@ void shouldClickTheButtonWithEmBorderWithOffset() {
     assertEquals(10, page.evaluate("offsetY"));
   }
 
-  @Test
-  void shouldClickAVeryLargeButtonWithOffset() {
+  @PlaywrightTest
+  void shouldClickAVeryLargeButtonWithOffset(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evalOnSelector("button", "button => button.style.borderWidth = '8px'");
     page.evalOnSelector("button", "button => button.style.height = button.style.width = '2000px'");
@@ -381,8 +382,8 @@ void shouldClickAVeryLargeButtonWithOffset() {
     assertEquals(1910, page.evaluate("offsetY"));
   }
 
-  @Test
-  void shouldClickAButtonInScrollingContainerWithOffset() {
+  @PlaywrightTest
+  void shouldClickAButtonInScrollingContainerWithOffset(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evalOnSelector("button", "button => {\n" +
       "  const container = document.createElement('div');\n" +
@@ -407,9 +408,9 @@ private static void expectCloseTo(double expected, double actual) {
   }
 
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip")
-  void shouldClickTheButtonWithOffsetWithPageScale() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "skip")
+  void shouldClickTheButtonWithOffsetWithPageScale(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(400, 400)
       .setIsMobile(true));
@@ -428,8 +429,8 @@ void shouldClickTheButtonWithOffsetWithPageScale() {
     context.close();
   }
 
-  @Test
-  void shouldWaitForStablePosition() {
+  @PlaywrightTest
+  void shouldWaitForStablePosition(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evalOnSelector("button", "button => {\n" +
       "  button.style.transition = 'margin 500ms linear 0s';\n" +
@@ -452,8 +453,8 @@ void shouldWaitForBecomingHitTarget() {
     // not supported in sync api
   }
 
-  @Test
-  void shouldFailWhenObscuredAndNotWaitingForHitTarget() {
+  @PlaywrightTest
+  void shouldFailWhenObscuredAndNotWaitingForHitTarget(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     page.evaluate("() => {\n" +
@@ -482,29 +483,29 @@ void shouldWaitForSelectToBeEnabled() {
     // not supported in sync api
   }
 
-  @Test
-  void shouldClickDisabledDiv() {
+  @PlaywrightTest
+  void shouldClickDisabledDiv(Page page) {
     page.setContent("<div onclick='javascript:window.__CLICKED=true;' disabled>Click target</div>");
     page.click("text=Click target");
     assertEquals(true, page.evaluate("__CLICKED"));
   }
 
-  @Test
-  void shouldClimbDomForInnerLabelWithPointerEventsNone() {
+  @PlaywrightTest
+  void shouldClimbDomForInnerLabelWithPointerEventsNone(Page page) {
     page.setContent("<button onclick='javascript:window.__CLICKED=true;'><label style='pointer-events:none'>Click target</label></button>");
     page.click("text=Click target");
     assertEquals(true, page.evaluate("__CLICKED"));
   }
 
-  @Test
-  void shouldWorkWithUnicodeSelectors() {
+  @PlaywrightTest
+  void shouldWorkWithUnicodeSelectors(Page page) {
     page.setContent("<button onclick='javascript:window.__CLICKED=true;'><label style='pointer-events:none'>Найти</label></button>");
     page.click("text=Найти");
     assertEquals(true, page.evaluate("__CLICKED"));
   }
 
-  @Test
-  void shouldClimbUpTo_roleButton_() {
+  @PlaywrightTest
+  void shouldClimbUpTo_roleButton_(Page page) {
     page.setContent("<div role=button onclick='javascript:window.__CLICKED=true;'><div style='pointer-events:none'><span><div>Click target</div></span></div>");
     page.click("text=Click target");
     assertEquals(true, page.evaluate("__CLICKED"));
@@ -518,8 +519,8 @@ void shouldWaitForLABELToBeClickableWhenItHasPointerEventsNone() {
     // not supported in sync api
   }
 
-  @Test
-  void shouldUpdateModifiersCorrectly() {
+  @PlaywrightTest
+  void shouldUpdateModifiersCorrectly(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.click("button", new Page.ClickOptions().setModifiers(asList(SHIFT)));
     assertEquals(true, page.evaluate("shiftKey"));
@@ -536,8 +537,8 @@ void shouldUpdateModifiersCorrectly() {
     assertEquals(false, page.evaluate("shiftKey"));
   }
 
-  @Test
-  void shouldClickAnOffscreenElementWhenScrollBehaviorIsSmooth() {
+  @PlaywrightTest
+  void shouldClickAnOffscreenElementWhenScrollBehaviorIsSmooth(Page page) {
     page.setContent(
       "<div style='border: 1px solid black; height: 500px; overflow: auto; width: 500px; scroll-behavior: smooth'>\n" +
         "    <button style='margin-top: 2000px' onClick='window.clicked = true'>hi</button>\n" +
@@ -546,8 +547,8 @@ void shouldClickAnOffscreenElementWhenScrollBehaviorIsSmooth() {
     assertEquals(true, page.evaluate("window.clicked"));
   }
 
-  @Test
-  void shouldReportNiceErrorWhenElementIsDetachedAndForceClicked() {
+  @PlaywrightTest
+  void shouldReportNiceErrorWhenElementIsDetachedAndForceClicked(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/animating-button.html");
     page.evaluate("addButton()");
     ElementHandle handle = page.querySelector("button");
@@ -571,8 +572,8 @@ void shouldRetryWhenElementIsAnimatingFromOutsideTheViewport() {
   void shouldFailWhenElementIsAnimatingFromOutsideTheViewportWithForce() {
     // not supported in sync api
   }
-  @Test
-  void shouldDispatchMicrotasksInOrder() {
+  @PlaywrightTest
+  void shouldDispatchMicrotasksInOrder(Page page) {
     page.setContent(
       "<button id=button>Click me</button>\n" +
       "<script>\n" +
@@ -594,8 +595,8 @@ void shouldDispatchMicrotasksInOrder() {
     assertEquals(1, page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldClickTheButtonWhenWindowInnerWidthIsCorrupted() {
+  @PlaywrightTest
+  void shouldClickTheButtonWhenWindowInnerWidthIsCorrupted(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => Object.defineProperty(window, 'innerWidth', {value: 0})");
     page.click("button");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java b/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
index 90c6336ca..9378c74a0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
@@ -1,10 +1,11 @@
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import com.microsoft.playwright.fixtures.Scope;
 import com.microsoft.playwright.options.ClientCertificate;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -16,13 +17,12 @@
 
 import static com.microsoft.playwright.Utils.nextFreePort;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestClientCertificates extends TestBase {
-  private ServerWithClientCertificate customServer;
-
+public class TestClientCertificates {
   private static Path asset(String path) {
     return Paths.get("src/test/resources/" + path).toAbsolutePath();
   }
@@ -40,25 +40,13 @@ private static String origin(String urlString) {
     }
   }
 
-  @BeforeAll
-  @Override
-  void startServer() throws IOException {
-    super.startServer();
-    customServer = ServerWithClientCertificate.create(nextFreePort());
-  }
-
-  @AfterAll
-  @Override
-  void stopServer() {
-    if (customServer != null) {
-      customServer.stop();
-      customServer = null;
-    }
-    super.stopServer();
+  @Fixture(scope = Scope.WORKER)
+  static ServerWithClientCertificate customServer() throws IOException {
+    return ServerWithClientCertificate.create(nextFreePort());
   }
 
-  @Test
-  public void shouldFailWithNoClientCertificatesProvided() {
+  @PlaywrightTest
+  public void shouldFailWithNoClientCertificatesProvided(Playwright playwright, ServerWithClientCertificate customServer) {
     APIRequestContext request = playwright.request().newContext(
         new APIRequest.NewContextOptions().setIgnoreHTTPSErrors(true));
     APIResponse response = request.get(customServer.url);
@@ -66,8 +54,8 @@ public void shouldFailWithNoClientCertificatesProvided() {
     request.dispose();
   }
 
-  @Test
-  public void shouldKeepSupportingHttp() {
+  @PlaywrightTest
+  public void shouldKeepSupportingHttp(Playwright playwright, Server server) {
     APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -82,8 +70,8 @@ public void shouldKeepSupportingHttp() {
     request.dispose();
   }
 
-  @Test
-  public void shouldThrowWithUntrustedClientCerts() {
+  @PlaywrightTest
+  public void shouldThrowWithUntrustedClientCerts(Playwright playwright, ServerWithClientCertificate customServer) {
     APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -101,8 +89,8 @@ public void shouldThrowWithUntrustedClientCerts() {
     request.dispose();
   }
 
-  @Test
-  public void passWithTrustedClientCertificates() {
+  @PlaywrightTest
+  public void passWithTrustedClientCertificates(Playwright playwright, ServerWithClientCertificate customServer) {
     APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -120,8 +108,8 @@ public void passWithTrustedClientCertificates() {
     request.dispose();
   }
 
-  @Test
-  public void passWithTrustedClientCertificatesPfx() {
+  @PlaywrightTest
+  public void passWithTrustedClientCertificatesPfx(Playwright playwright, ServerWithClientCertificate customServer) {
     APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -139,13 +127,9 @@ public void passWithTrustedClientCertificatesPfx() {
     request.dispose();
   }
 
-  static boolean isWebKitMacOS() {
-    return isWebKit() && isMac;
-  }
-
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
-  public void shouldWorkWithBrowserNewContext() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.MAC, reason = "The network connection was lost.")
+  public void shouldWorkWithBrowserNewContext(Browser browser, ServerWithClientCertificate customServer) {
     Browser.NewContextOptions options = new Browser.NewContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -170,9 +154,9 @@ public void shouldWorkWithBrowserNewContext() {
     }
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
-  public void shouldWorkWithBrowserNewPage() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.MAC, reason = "The network connection was lost.")
+  public void shouldWorkWithBrowserNewPage(Browser browser, ServerWithClientCertificate customServer) {
     Browser.NewPageOptions options = new Browser.NewPageOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -196,9 +180,9 @@ public void shouldWorkWithBrowserNewPage() {
     }
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
-  public void shouldWorkWithBrowserNewPageWhenPassingAsContent() throws IOException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.MAC, reason = "The network connection was lost.")
+  public void shouldWorkWithBrowserNewPageWhenPassingAsContent(Browser browser, ServerWithClientCertificate customServer) throws IOException {
     Browser.NewPageOptions options = new Browser.NewPageOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
@@ -222,11 +206,11 @@ public void shouldWorkWithBrowserNewPageWhenPassingAsContent() throws IOExceptio
     }
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.MAC, reason = "The network connection was lost.")
   // No cleanup: on Windows Chromium may keep chrome_debug.log in the user data dir
   // locked briefly after close, failing the deletion.
-  public void shouldWorkWithBrowserLaunchPersistentContext(@TempDir(cleanup = CleanupMode.NEVER) Path tmpDir) {
+  public void shouldWorkWithBrowserLaunchPersistentContext(Browser browser, ServerWithClientCertificate customServer, @TempDir(cleanup = CleanupMode.NEVER) Path tmpDir) {
     BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
       .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
       .setClientCertificates(asList(
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java b/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java
index 91961d1c5..819cf3f10 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDebugger.java
@@ -16,20 +16,20 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.DebuggerPausedDetails;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestDebugger extends TestBase {
-  @Test
-  void shouldReturnNullPausedDetailsInitially() {
+public class TestDebugger {
+  @PlaywrightTest
+  void shouldReturnNullPausedDetailsInitially(BrowserContext context) {
     Debugger dbg = context.debugger();
     assertNull(dbg.pausedDetails());
   }
 
-  @Test
-  void shouldPauseAtNextAndResume() {
+  @PlaywrightTest
+  void shouldPauseAtNextAndResume(Page page, BrowserContext context) {
     page.setContent("<div>click me</div>");
     Debugger dbg = context.debugger();
     assertNull(dbg.pausedDetails());
@@ -51,8 +51,8 @@ void shouldPauseAtNextAndResume() {
     assertNull(dbg.pausedDetails());
   }
 
-  @Test
-  void shouldStepWithNext() {
+  @PlaywrightTest
+  void shouldStepWithNext(Page page, BrowserContext context) {
     page.setContent("<div>click me</div>");
     Debugger dbg = context.debugger();
     assertNull(dbg.pausedDetails());
@@ -76,8 +76,8 @@ void shouldStepWithNext() {
     assertNull(dbg.pausedDetails());
   }
 
-  @Test
-  void shouldPauseAtPauseCall() {
+  @PlaywrightTest
+  void shouldPauseAtPauseCall(Page page, BrowserContext context) {
     page.setContent("<div>click me</div>");
     Debugger dbg = context.debugger();
     assertNull(dbg.pausedDetails());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
index 458738b37..536b078dc 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
@@ -16,11 +16,12 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Contrast;
 import com.microsoft.playwright.options.Geolocation;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
@@ -38,12 +39,14 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.options.ColorScheme.DARK;
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.Env.isWindows;
+import static com.microsoft.playwright.options.ColorScheme.DARK;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestDefaultBrowserContext2 extends TestBase {
+public class TestDefaultBrowserContext2 {
 
 
   private BrowserContext persistentContext;
@@ -59,59 +62,59 @@ void closePersistentContext() {
     }
   }
 
-  private Page launchPersistent() {
-    return launchPersistent(null);
+  private Page launchPersistent(BrowserType browserType) {
+    return launchPersistent(browserType, null);
   }
 
-  private Page launchPersistent(BrowserType.LaunchPersistentContextOptions options) {
+  private Page launchPersistent(BrowserType browserType, BrowserType.LaunchPersistentContextOptions options) {
     Path userDataDir = tempDir.resolve("user-data-dir");
     assertNull(persistentContext);
     persistentContext = browserType.launchPersistentContext(userDataDir, options);
     return persistentContext.pages().get(0);
   }
 
-  @Test
-  void shouldSupportHasTouchOption() {
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions().setHasTouch(true));
+  @PlaywrightTest
+  void shouldSupportHasTouchOption(BrowserType browserType, Server server) {
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions().setHasTouch(true));
     page.navigate(server.PREFIX + "/mobile.html");
     assertEquals(true, page.evaluate("() => 'ontouchstart' in window"));
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip")
-  void shouldWorkInPersistentContext() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "skip")
+  void shouldWorkInPersistentContext(BrowserType browserType, Server server) {
     // Firefox does not support mobile.
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions()
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions()
       .setViewportSize(320, 480).setIsMobile(true));
     page.navigate(server.PREFIX + "/empty.html");
     assertEquals(980, page.evaluate("() => window.innerWidth"));
   }
 
-  @Test
-  void shouldSupportColorSchemeOption() {
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions().setColorScheme(DARK));
+  @PlaywrightTest
+  void shouldSupportColorSchemeOption(BrowserType browserType) {
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions().setColorScheme(DARK));
     assertEquals(false, page.evaluate("matchMedia('(prefers-color-scheme: light)').matches"));
     assertEquals(true, page.evaluate("matchMedia('(prefers-color-scheme: dark)').matches"));
   }
 
-  @Test
-  void shouldSupportTimezoneIdOption() {
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions()
+  @PlaywrightTest
+  void shouldSupportTimezoneIdOption(BrowserType browserType) {
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions()
       .setLocale("en-US").setTimezoneId("America/Jamaica"));
     assertEquals("Sat Nov 19 2016 13:12:34 GMT-0500 (Eastern Standard Time)",
       page.evaluate("new Date(1479579154987).toString()"));
   }
 
-  @Test
-  void shouldSupportLocaleOption() {
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions()
+  @PlaywrightTest
+  void shouldSupportLocaleOption(BrowserType browserType) {
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions()
       .setLocale("fr-FR"));
     assertEquals("fr-FR", page.evaluate("navigator.language"));
   }
 
-  @Test
-  void shouldSupportGeolocationAndPermissionsOptions() {
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions()
+  @PlaywrightTest
+  void shouldSupportGeolocationAndPermissionsOptions(BrowserType browserType, Server server) {
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions()
       .setGeolocation(new Geolocation(10, 10))
       .setPermissions(asList("geolocation")));
     page.navigate(server.EMPTY_PAGE);
@@ -121,25 +124,25 @@ void shouldSupportGeolocationAndPermissionsOptions() {
     assertEquals(mapOf("latitude", 10, "longitude", 10), geolocation);
   }
 
-  //  @Test
+  //  @PlaywrightTest
   void shouldSupportIgnoreHTTPSErrorsOption() {
     // TODO: net::ERR_EMPTY_RESPONSE at https://localhost:8908/empty.html
-//    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions().setIgnoreHTTPSErrors(true));
+//    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions().setIgnoreHTTPSErrors(true));
 //    Response response = page.navigate(httpsServer.EMPTY_PAGE);
 //    assertTrue(response.ok());
   }
 
-  @Test
-  void shouldSupportExtraHTTPHeadersOption() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSupportExtraHTTPHeadersOption(BrowserType browserType, Server server) throws ExecutionException, InterruptedException {
 //   TODO: test.flaky(browserName === "firefox" && headed && platform === "linux", "Intermittent timeout on bots");
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions().setExtraHTTPHeaders(mapOf("foo", "bar")));
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions().setExtraHTTPHeaders(mapOf("foo", "bar")));
     Future<Server.Request> request = server.futureRequest("/empty.html");
     page.navigate(server.EMPTY_PAGE);
     assertEquals(asList("bar"), request.get().headers.get("foo"));
   }
 
-  @Test
-  void shouldAcceptUserDataDir() throws IOException {
+  @PlaywrightTest
+  void shouldAcceptUserDataDir(BrowserType browserType) throws IOException {
 // TODO:   test.flaky(browserName === "chromium");
     Path userDataDir = tempDir.resolve("user-data-dir");
     BrowserContext context = browserType.launchPersistentContext(userDataDir);
@@ -148,8 +151,8 @@ void shouldAcceptUserDataDir() throws IOException {
     assertTrue(userDataDir.toFile().listFiles().length > 0);
   }
 
-  @Test
-  void shouldRestoreStateFromUserDataDir() throws IOException {
+  @PlaywrightTest
+  void shouldRestoreStateFromUserDataDir(BrowserType browserType, Server server) throws IOException {
 //  TODO:  test.slow();
     Path userDataDir = tempDir.resolve("user-data-dir");
     BrowserType.LaunchPersistentContextOptions browserOptions = null;
@@ -173,16 +176,16 @@ void shouldRestoreStateFromUserDataDir() throws IOException {
     browserContext3.close();
   }
 
-  @Test
-  void shouldHaveDefaultURLWhenLaunchingBrowser() {
-    launchPersistent();
+  @PlaywrightTest
+  void shouldHaveDefaultURLWhenLaunchingBrowser(BrowserType browserType) {
+    launchPersistent(browserType);
     List<String> urls = persistentContext.pages().stream().map(page -> page.url()).collect(Collectors.toList());
     assertEquals(asList("about:blank"), urls);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip")
-  void shouldThrowIfPageArgumentIsPassed() throws IOException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "skip")
+  void shouldThrowIfPageArgumentIsPassed(BrowserType browserType, Server server) throws IOException {
     BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
       .setArgs(asList(server.EMPTY_PAGE));
     Path userDataDir = tempDir.resolve("user-data-dir");
@@ -192,8 +195,8 @@ void shouldThrowIfPageArgumentIsPassed() throws IOException {
     assertTrue(e.getMessage().contains("can not specify page"));
   }
 
-  @Test
-  void shouldWorkWithIgnoreDefaultArgs() {
+  @PlaywrightTest
+  void shouldWorkWithIgnoreDefaultArgs(BrowserType browserType) {
     // Ignore arguments by name.
     BrowserType.LaunchOptions options = new BrowserType.LaunchOptions().setIgnoreDefaultArgs(asList("foo"));
     Browser browser = browserType.launch(options);
@@ -212,9 +215,9 @@ void shouldHandleTimeout() {
   void shouldHandleException() {
   }
 
-  @Test
-  void shouldFireCloseEventForAPersistentContext() {
-    launchPersistent();
+  @PlaywrightTest
+  void shouldFireCloseEventForAPersistentContext(BrowserType browserType) {
+    launchPersistent(browserType);
     boolean[] closed = {false};
     persistentContext.onClose(context -> closed[0] = true);
     closePersistentContext();
@@ -229,9 +232,9 @@ void coverageShouldBeMissing() {
     // TODO:
   }
 
-  @Test
-  void shouldRespectSelectors() {
-    Page page = launchPersistent();
+  @PlaywrightTest
+  void shouldRespectSelectors(BrowserType browserType, Playwright playwright) {
+    Page page = launchPersistent(browserType);
     String defaultContextCSS = "{\n" +
       "  create(root, target) {},\n" +
       "  query(root, selector) {\n" +
@@ -248,10 +251,10 @@ void shouldRespectSelectors() {
     assertEquals("hello", page.innerHTML("defaultContextCSS=div"));
   }
 
-  @Test
-  void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldUploadLargeFile(BrowserType browserType, Server server, @TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
     Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
-    Page page = launchPersistent();
+    Page page = launchPersistent(browserType);
     page.navigate(server.PREFIX + "/input/fileupload.html");
     Path uploadFile = tmpDir.resolve("200MB.zip");
     String str = String.join("", Collections.nCopies(4 * 1024, "A"));
@@ -289,9 +292,9 @@ void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionEx
     assertEquals(200 * 1024 * 1024, fields.get(0).content.length());
   }
 
-  @Test
-  void shouldSupportContrastOption() {
-    Page page = launchPersistent(new BrowserType.LaunchPersistentContextOptions().setContrast(Contrast.MORE));
+  @PlaywrightTest
+  void shouldSupportContrastOption(BrowserType browserType) {
+    Page page = launchPersistent(browserType, new BrowserType.LaunchPersistentContextOptions().setContrast(Contrast.MORE));
     assertEquals(true, page.evaluate("() => matchMedia('(prefers-contrast: more)').matches"));
     assertEquals(false, page.evaluate("() => matchMedia('(prefers-contrast: no-preference)').matches"));
   }
@@ -300,9 +303,9 @@ static boolean tempDirCanBeOnDifferentRoot() {
     return isWindows;
   }
 
-  @Test
+  @PlaywrightTest
   @DisabledIf(value="tempDirCanBeOnDifferentRoot", disabledReason="IllegalArgument 'other' has different root on GitHub Actions.")
-  void shouldAcceptRelativeUserDataDir(@TempDir Path tmpDir) throws Exception {
+  void shouldAcceptRelativeUserDataDir(BrowserType browserType, @TempDir Path tmpDir) throws Exception {
     Path userDataDir = tempDir.resolve("user-data-dir");
     Path cwd = Paths.get("").toAbsolutePath();
     Path relativePath = cwd.relativize(userDataDir);
@@ -311,9 +314,9 @@ void shouldAcceptRelativeUserDataDir(@TempDir Path tmpDir) throws Exception {
     context.close();
   }
 
-  @Test
-  void shouldExposeBrowser() {
-    Page page = launchPersistent();
+  @PlaywrightTest
+  void shouldExposeBrowser(BrowserType browserType) {
+    Page page = launchPersistent(browserType);
     BrowserContext context = page.context();
     Browser browser = context.browser();
     assertFalse(browser.version().isEmpty());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDialog.java b/playwright/src/test/java/com/microsoft/playwright/TestDialog.java
index 4f5d8a2e6..9e863b40c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDialog.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDialog.java
@@ -16,18 +16,20 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import org.junit.jupiter.api.condition.OS;
 
 import java.time.Duration;
 import java.time.Instant;
 
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestDialog extends TestBase {
+public class TestDialog {
 
-  @Test
-  void shouldFire() {
+  @PlaywrightTest
+  void shouldFire(Page page) {
     page.onDialog(dialog -> {
       assertEquals("alert", dialog.type());
       assertEquals( "", dialog.defaultValue());
@@ -37,8 +39,8 @@ void shouldFire() {
     page.evaluate("() => alert('yo')");
   }
 
-  @Test
-  void shouldAllowAcceptingPrompts() {
+  @PlaywrightTest
+  void shouldAllowAcceptingPrompts(Page page) {
     page.onDialog(dialog -> {
       assertEquals("prompt", dialog.type());
       assertEquals("yes.", dialog.defaultValue());
@@ -49,8 +51,8 @@ void shouldAllowAcceptingPrompts() {
     assertEquals("answer!", result);
   }
 
-  @Test
-  void shouldAcceptPromptOnce() {
+  @PlaywrightTest
+  void shouldAcceptPromptOnce(Page page) {
     int[] callCounter = {0};
     page.onceDialog(dialog -> {
       ++callCounter[0];
@@ -63,8 +65,8 @@ void shouldAcceptPromptOnce() {
     assertEquals(1, callCounter[0]);
   }
 
-  @Test
-  void shouldDismissThePrompt() {
+  @PlaywrightTest
+  void shouldDismissThePrompt(Page page) {
     page.onDialog(dialog -> {
       dialog.dismiss();
     });
@@ -72,8 +74,8 @@ void shouldDismissThePrompt() {
     assertNull(result);
   }
 
-  @Test
-  void shouldAcceptTheConfirmPrompt() {
+  @PlaywrightTest
+  void shouldAcceptTheConfirmPrompt(Page page) {
     page.onDialog(dialog -> {
       dialog.accept();
     });
@@ -81,8 +83,8 @@ void shouldAcceptTheConfirmPrompt() {
     assertEquals(true, result);
   }
 
-  @Test
-  void shouldDismissTheConfirmPrompt() {
+  @PlaywrightTest
+  void shouldDismissTheConfirmPrompt(Page page) {
     page.onDialog(dialog -> {
       dialog.dismiss();
     });
@@ -90,13 +92,9 @@ void shouldDismissTheConfirmPrompt() {
     assertEquals(false, result);
   }
 
-  static boolean isWebKitMac() {
-    return isWebKit() && Utils.getOS() == Utils.OS.MAC;
-  }
-
-  @Test
-  @DisabledIf(value="isWebKitMac", disabledReason="fixme")
-  void shouldBeAbleToCloseContextWithOpenAlert() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.MAC, reason = "fixme")
+  void shouldBeAbleToCloseContextWithOpenAlert(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     boolean[] didShowDialog = {false};
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDispatchEvent.java b/playwright/src/test/java/com/microsoft/playwright/TestDispatchEvent.java
index 57781da7f..4039403d1 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDispatchEvent.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDispatchEvent.java
@@ -16,23 +16,24 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class TestDispatchEvent extends TestBase {
+public class TestDispatchEvent {
 
-  @Test
-  void shouldDispatchClickEvent() {
+  @PlaywrightTest
+  void shouldDispatchClickEvent(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.dispatchEvent("button", "click");
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldDispatchClickEventProperties() {
+  @PlaywrightTest
+  void shouldDispatchClickEventProperties(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.dispatchEvent("button", "click");
     assertNotNull(page.evaluate("bubbles"));
@@ -40,8 +41,8 @@ void shouldDispatchClickEventProperties() {
     assertNotNull(page.evaluate("composed"));
   }
 
-  @Test
-  void shouldDispatchClickSvg() {
+  @PlaywrightTest
+  void shouldDispatchClickSvg(Page page) {
     page.setContent("<svg height='100' width='100'>\n" +
       "  <circle onclick='javascript:window.__CLICKED=42' cx='50' cy='50' r='40' stroke='black' stroke-width='3' fill='red' />\n" +
       "</svg>");
@@ -49,8 +50,8 @@ void shouldDispatchClickSvg() {
     assertEquals(42, page.evaluate("() => window['__CLICKED']"));
   }
 
-  @Test
-  void shouldDispatchClickOnASpanWithAnInlineElementInside() {
+  @PlaywrightTest
+  void shouldDispatchClickOnASpanWithAnInlineElementInside(Page page) {
     page.setContent("<style>\n" +
       "span::before {\n" +
       "  content: 'q';\n" +
@@ -61,8 +62,8 @@ void shouldDispatchClickOnASpanWithAnInlineElementInside() {
     assertEquals(42, page.evaluate("() => window['CLICKED']"));
   }
 
-  @Test
-  void shouldDispatchClickAfterNavigation() {
+  @PlaywrightTest
+  void shouldDispatchClickAfterNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.dispatchEvent("button", "click");
     page.navigate(server.PREFIX + "/input/button.html");
@@ -70,8 +71,8 @@ void shouldDispatchClickAfterNavigation() {
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldDispatchClickAfterACrossOriginNavigation() {
+  @PlaywrightTest
+  void shouldDispatchClickAfterACrossOriginNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.dispatchEvent("button", "click");
     page.navigate(server.CROSS_PROCESS_PREFIX + "/input/button.html");
@@ -79,8 +80,8 @@ void shouldDispatchClickAfterACrossOriginNavigation() {
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldNotFailWhenElementIsBlockedOnHover() {
+  @PlaywrightTest
+  void shouldNotFailWhenElementIsBlockedOnHover(Page page) {
     page.setContent("<style>\n" +
       "  container { display: block; position: relative; width: 200px; height: 50px; }\n" +
       "  div, button { position: absolute; left: 0; top: 0; bottom: 0; right: 0; }\n" +
@@ -95,8 +96,8 @@ void shouldNotFailWhenElementIsBlockedOnHover() {
     assertNotNull(page.evaluate("() => window['clicked']"));
   }
 
-  @Test
-  void shouldDispatchClickWhenNodeIsAddedInShadowDom() {
+  @PlaywrightTest
+  void shouldDispatchClickWhenNodeIsAddedInShadowDom(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("() => {\n" +
       "  const div = document.createElement('div');\n" +
@@ -120,8 +121,8 @@ void shouldBeAtomic() {
     // TODO: playwright.selectors.register
   }
 
-  @Test
-  void shouldDispatchDragDropEvents() {
+  @PlaywrightTest
+  void shouldDispatchDragDropEvents(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     JSHandle dataTransfer = page.evaluateHandle("() => new DataTransfer()");
     page.dispatchEvent("#source", "dragstart", mapOf("dataTransfer", dataTransfer));
@@ -133,8 +134,8 @@ void shouldDispatchDragDropEvents() {
       "}", mapOf("source", source,"target", target)));
   }
 
-  @Test
-  void shouldDispatchDragDropEventsOnHandle() {
+  @PlaywrightTest
+  void shouldDispatchDragDropEventsOnHandle(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     JSHandle dataTransfer = page.evaluateHandle("() => new DataTransfer()");
     ElementHandle source = page.querySelector("#source");
@@ -146,8 +147,8 @@ void shouldDispatchDragDropEventsOnHandle() {
       "}", mapOf("source", source,"target", target)));
   }
 
-  @Test
-  void shouldDispatchClickEventOnHandle() {
+  @PlaywrightTest
+  void shouldDispatchClickEventOnHandle(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     button.dispatchEvent("click");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDownload.java b/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
index d391407cb..4968c1f8e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
@@ -16,10 +16,11 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.condition.EnabledIf;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,17 +33,20 @@
 import java.time.Instant;
 import java.util.Collections;
 
-import static com.microsoft.playwright.options.KeyboardModifier.ALT;
+import static com.microsoft.playwright.Utils.chromiumVersionLessThan;
 import static com.microsoft.playwright.Utils.copy;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.options.KeyboardModifier.ALT;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestDownload extends TestBase {
+public class TestDownload {
 
   @BeforeEach
-  void addRoutes() {
+  void addRoutes(Server server) {
     server.setRoute("/download", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "application/octet-stream");
       exchange.getResponseHeaders().add("Content-Disposition", "attachment");
@@ -73,8 +77,8 @@ void addRoutes() {
 
   }
 
-  @Test
-  void shouldReportDownloadWhenNavigationTurnsIntoDownload() throws IOException {
+  @PlaywrightTest
+  void shouldReportDownloadWhenNavigationTurnsIntoDownload(Browser browser, Server server, BrowserName browserName) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
 
     Response[] response = new Response[]{null};
@@ -97,13 +101,13 @@ void shouldReportDownloadWhenNavigationTurnsIntoDownload() throws IOException {
     if (!chromiumVersionLessThan(browser.version(), "140.0.0.0")) {
       assertTrue(error[0].getMessage().contains("Download is starting"));
     }
-    if (!isFirefox())
+    if (browserName != FIREFOX)
       assertEquals("about:blank", page.url());
     page.close();
   }
 
-  @Test
-  void shouldReportDownloadsWithAcceptDownloadsFalse() {
+  @PlaywrightTest
+  void shouldReportDownloadsWithAcceptDownloadsFalse(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(false))) {
       page.setContent("<a href='" + server.PREFIX + "/downloadWithFilename'>download</a>");
       Download download = page.waitForDownload(() -> page.click("a"));
@@ -114,8 +118,8 @@ void shouldReportDownloadsWithAcceptDownloadsFalse() {
       assertTrue(e.getMessage().contains("acceptDownloads: true"));
     }
   }
-  @Test
-  void shouldReportDownloadsWithAcceptDownloadsTrue() throws IOException {
+  @PlaywrightTest
+  void shouldReportDownloadsWithAcceptDownloadsTrue(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -126,8 +130,8 @@ void shouldReportDownloadsWithAcceptDownloadsTrue() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldSaveToUserSpecifiedPath() throws IOException {
+  @PlaywrightTest
+  void shouldSaveToUserSpecifiedPath(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -140,8 +144,8 @@ void shouldSaveToUserSpecifiedPath() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldSaveToUserSpecifiedPathWithoutUpdatingOriginalPath() throws IOException {
+  @PlaywrightTest
+  void shouldSaveToUserSpecifiedPathWithoutUpdatingOriginalPath(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -163,8 +167,8 @@ void shouldSaveToUserSpecifiedPathWithoutUpdatingOriginalPath() throws IOExcepti
   }
 
 
-  @Test
-  void shouldSaveToTwoDifferentPathsWithMultipleSaveAsCalls() throws IOException {
+  @PlaywrightTest
+  void shouldSaveToTwoDifferentPathsWithMultipleSaveAsCalls(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -185,8 +189,8 @@ void shouldSaveToTwoDifferentPathsWithMultipleSaveAsCalls() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldSaveToOverwrittenFilepath() throws IOException {
+  @PlaywrightTest
+  void shouldSaveToOverwrittenFilepath(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -206,8 +210,8 @@ void shouldSaveToOverwrittenFilepath() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldCreateSubdirectoriesWhenSavingToNonExistentUserSpecifiedPath() throws IOException {
+  @PlaywrightTest
+  void shouldCreateSubdirectoriesWhenSavingToNonExistentUserSpecifiedPath(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -225,8 +229,8 @@ void shouldSaveWhenConnectedRemotely() {
     // TODO: Support connect
   }
 
-  @Test
-  void shouldErrorWhenSavingWithDownloadsDisabled() throws IOException {
+  @PlaywrightTest
+  void shouldErrorWhenSavingWithDownloadsDisabled(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(false));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -237,8 +241,8 @@ void shouldErrorWhenSavingWithDownloadsDisabled() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldErrorWhenSavingAfterDeletion() throws IOException {
+  @PlaywrightTest
+  void shouldErrorWhenSavingAfterDeletion(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -254,8 +258,8 @@ void shouldErrorWhenSavingAfterDeletionWhenConnectedRemotely() {
   // TODO: Support connect
   }
 
-  @Test
-  void shouldReportNonNavigationDownloads() throws IOException {
+  @PlaywrightTest
+  void shouldReportNonNavigationDownloads(Browser browser, Server server) throws IOException {
     // Mac WebKit embedder does not download in this case, although Safari does.
     server.setRoute("/download", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "application/octet-stream");
@@ -278,8 +282,8 @@ void shouldReportNonNavigationDownloads() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldReportDownloadPathWithinPageOnDownloadHandlerForFiles() throws IOException {
+  @PlaywrightTest
+  void shouldReportDownloadPathWithinPageOnDownloadHandlerForFiles(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     @SuppressWarnings("unchecked")
@@ -298,8 +302,8 @@ void shouldReportDownloadPathWithinPageOnDownloadHandlerForFiles() throws IOExce
     page.close();
   }
 
-  @Test
-  void shouldReportDownloadPathWithinPageOnDownloadHandlerForBlobs() throws IOException {
+  @PlaywrightTest
+  void shouldReportDownloadPathWithinPageOnDownloadHandlerForBlobs(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     @SuppressWarnings("unchecked")
     Download[] download = {null};
@@ -318,9 +322,9 @@ void shouldReportDownloadPathWithinPageOnDownloadHandlerForBlobs() throws IOExce
     page.close();
   }
 
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="fixme")
-  void shouldReportAltClickDownloads() throws IOException {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = CHROMIUM, reason = "fixme")
+  void shouldReportAltClickDownloads(Browser browser, Server server) throws IOException {
     // Firefox does not download on alt-click by default.
     // Our WebKit embedder does not download on alt-click, although Safari does.
     server.setRoute("/download", exchange -> {
@@ -341,13 +345,9 @@ void shouldReportAltClickDownloads() throws IOException {
   }
 
 
-  static boolean isChromiumHeaded() {
-    return isChromium() && isHeaded();
-  }
-
-  @Test
-  @DisabledIf(value="isChromiumHeaded", disabledReason="fixme")
-  void shouldReportNewWindowDownloads() throws IOException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, headed = true, reason = "fixme")
+  void shouldReportNewWindowDownloads(Browser browser, Server server) throws IOException {
     // TODO: - the test fails in headed Chromium as the popup page gets closed along
     // with the session before download completed event arrives.
     // - WebKit doesn't close the popup page
@@ -361,8 +361,8 @@ void shouldReportNewWindowDownloads() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldDeleteFile() {
+  @PlaywrightTest
+  void shouldDeleteFile(Browser browser, Server server) {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -373,8 +373,8 @@ void shouldDeleteFile() {
     page.close();
   }
 
-  @Test
-  void shouldExposeStream() throws IOException {
+  @PlaywrightTest
+  void shouldExposeStream(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -386,8 +386,8 @@ void shouldExposeStream() throws IOException {
     page.close();
   }
 
-  @Test
-  void streamShouldSupportZeroSizeRead() throws IOException {
+  @PlaywrightTest
+  void streamShouldSupportZeroSizeRead(Browser browser, Server server) throws IOException {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download = page.waitForDownload(() -> page.click("a"));
@@ -399,8 +399,8 @@ void streamShouldSupportZeroSizeRead() throws IOException {
     page.close();
   }
 
-  @Test
-  void shouldDeleteDownloadsOnContextDestruction() {
+  @PlaywrightTest
+  void shouldDeleteDownloadsOnContextDestruction(Browser browser, Server server) {
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
     Download download1 = page.waitForDownload(() -> page.click("a"));
@@ -414,8 +414,8 @@ void shouldDeleteDownloadsOnContextDestruction() {
     assertFalse(Files.exists(path2));
   }
 
-  @Test
-  void shouldDeleteDownloadsOnBrowserGone() {
+  @PlaywrightTest
+  void shouldDeleteDownloadsOnBrowserGone(BrowserType browserType, Server server) {
     Browser browser = browserType.launch();
     Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true));
     page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
@@ -431,8 +431,8 @@ void shouldDeleteDownloadsOnBrowserGone() {
     assertFalse(Files.exists(path1.resolve("..")));
   }
 
-  @Test
-  void shouldBeAbleToCancelPendingDownloads() {
+  @PlaywrightTest
+  void shouldBeAbleToCancelPendingDownloads(Browser browser, Server server) {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true))) {
       page.setContent("<a href='" + server.PREFIX + "/downloadWithDelay'>download</a>");
       Download download = page.waitForDownload(() -> page.click("a"));
@@ -442,8 +442,8 @@ void shouldBeAbleToCancelPendingDownloads() {
     }
   }
 
-  @Test
-  void shouldNotFailExplicitlyToCancelADownloadEvenIfThatIsAlreadyFinished() throws IOException {
+  @PlaywrightTest
+  void shouldNotFailExplicitlyToCancelADownloadEvenIfThatIsAlreadyFinished(Browser browser, Server server) throws IOException {
     try (Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(true))) {
       page.setContent("<a href='" + server.PREFIX + "/download'>download</a>");
       Download download = page.waitForDownload(() -> page.click("a"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleBoundingBox.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleBoundingBox.java
index c08c78ec1..b733d79e7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleBoundingBox.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleBoundingBox.java
@@ -16,23 +16,20 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BoundingBox;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.util.Map;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleBoundingBox extends TestBase {
+public class TestElementHandleBoundingBox {
 
-  static boolean isFirefoxHeaded() {
-    return isFirefox() && isHeaded();
-  }
-
-  @Test
-  @DisabledIf(value="isFirefoxHeaded", disabledReason="fail")
-  void shouldWork() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, headed = true, reason = "fail")
+  void shouldWork(Page page, Server server) {
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     ElementHandle elementHandle = page.querySelector(".box:nth-of-type(13)");
@@ -43,8 +40,8 @@ void shouldWork() {
     assertEquals(50, box.height);
   }
 
-  @Test
-  void shouldHandleNestedFrames() {
+  @PlaywrightTest
+  void shouldHandleNestedFrames(Page page, Server server) {
     page.setViewportSize(616, 500);
     page.navigate(server.PREFIX + "/frames/nested-frames.html");
     Frame nestedFrame = page.frame("dos");
@@ -57,15 +54,15 @@ void shouldHandleNestedFrames() {
     assertEquals(18, box.height);
   }
 
-  @Test
-  void shouldReturnNullForInvisibleElements() {
+  @PlaywrightTest
+  void shouldReturnNullForInvisibleElements(Page page) {
     page.setContent("<div style='display:none'>hi</div>");
     ElementHandle element = page.querySelector("div");
     assertNull(element.boundingBox());
   }
 
-  @Test
-  void shouldForceALayout() {
+  @PlaywrightTest
+  void shouldForceALayout(Page page) {
     page.setViewportSize(500, 500);
     page.setContent("<div style='width: 100px; height: 100px'>hello</div>");
     ElementHandle elementHandle = page.querySelector("div");
@@ -77,8 +74,8 @@ void shouldForceALayout() {
     assertEquals(box.height, 200);
   }
 
-  @Test
-  void shouldWorkWithSVGNodes() {
+  @PlaywrightTest
+  void shouldWorkWithSVGNodes(Page page) {
     page.setContent("<svg xmlns='http://www.w3.org/2000/svg' width='500' height='500'>\n" +
       "<rect id='theRect' x='30' y='50' width='200' height='300'></rect>\n" +
       "</svg>");
@@ -95,9 +92,9 @@ void shouldWorkWithSVGNodes() {
     assertEquals(webBoundingBox.get("height").doubleValue(), pwBoundingBox.height);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip")
-  void shouldWorkWithPageScale() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "skip")
+  void shouldWorkWithPageScale(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(400, 400).setIsMobile(true));
     Page page = context.newPage();
@@ -126,8 +123,8 @@ static long round(Object o) {
     return Math.round((Double) o);
   }
 
-  @Test
-  void shouldWorkWhenInlineBoxChildIsOutsideOfViewport() {
+  @PlaywrightTest
+  void shouldWorkWhenInlineBoxChildIsOutsideOfViewport(Page page) {
     page.setContent("<style>\n" +
       "i {\n" +
       "  position: absolute;\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleClick.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleClick.java
index 9fc0e342e..879755cf6 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleClick.java
@@ -16,22 +16,22 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleClick extends TestBase {
+public class TestElementHandleClick {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     button.click();
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldWorkWithNodeRemoved() {
+  @PlaywrightTest
+  void shouldWorkWithNodeRemoved(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => delete window['Node']");
     ElementHandle button  = page.querySelector("button");
@@ -39,24 +39,24 @@ void shouldWorkWithNodeRemoved() {
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldWorkForShadowDOMV1() {
+  @PlaywrightTest
+  void shouldWorkForShadowDOMV1(Page page, Server server) {
     page.navigate(server.PREFIX + "/shadow.html");
     ElementHandle buttonHandle = page.evaluateHandle("() => window['button']").asElement();
     buttonHandle.click();
     assertEquals(true, page.evaluate("clicked"));
   }
 
-  @Test
-  void shouldWorkForTextNodes() {
+  @PlaywrightTest
+  void shouldWorkForTextNodes(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle buttonTextNode = page.evaluateHandle("() => document.querySelector('button').firstChild").asElement();
     buttonTextNode.click();
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldThrowForDetachedNodes() {
+  @PlaywrightTest
+  void shouldThrowForDetachedNodes(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     page.evaluate("button => button.remove()", button);
@@ -64,8 +64,8 @@ void shouldThrowForDetachedNodes() {
     assertTrue(e.getMessage().contains("Element is not attached to the DOM"));
   }
 
-  @Test
-  void shouldThrowForHiddenNodesWithForce() {
+  @PlaywrightTest
+  void shouldThrowForHiddenNodesWithForce(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     page.evaluate("button => button.style.display = 'none'", button);
@@ -75,8 +75,8 @@ void shouldThrowForHiddenNodesWithForce() {
     assertTrue(e.getMessage().contains("Element is not visible"));
   }
 
-  @Test
-  void shouldThrowForRecursivelyHiddenNodesWithForce() {
+  @PlaywrightTest
+  void shouldThrowForRecursivelyHiddenNodesWithForce(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     page.evaluate("button => button.parentElement.style.display = 'none'", button);
@@ -86,8 +86,8 @@ void shouldThrowForRecursivelyHiddenNodesWithForce() {
     assertTrue(e.getMessage().contains("Element is not visible"));
   }
 
-  @Test
-  void shouldThrowForBrElementsWithForce() {
+  @PlaywrightTest
+  void shouldThrowForBrElementsWithForce(Page page) {
     page.setContent("hello<br>goodbye");
     ElementHandle br = page.querySelector("br");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -96,8 +96,8 @@ void shouldThrowForBrElementsWithForce() {
     assertTrue(e.getMessage().contains("Element is outside of the viewport"));
   }
 
-  @Test
-  void shouldDoubleClickTheButton() {
+  @PlaywrightTest
+  void shouldDoubleClickTheButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => {\n" +
       "  window['double'] = false;\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleContentFrame.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleContentFrame.java
index 1938991e1..4e52ceaf5 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleContentFrame.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleContentFrame.java
@@ -16,15 +16,15 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static com.microsoft.playwright.Utils.attachFrame;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleContentFrame extends TestBase {
+public class TestElementHandleContentFrame {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     ElementHandle elementHandle = page.querySelector("#frame1");
@@ -32,8 +32,8 @@ void shouldWork() {
     assertEquals(page.frames().get(1), frame);
   }
 
-  @Test
-  void shouldWorkForCrossProcessIframes() {
+  @PlaywrightTest
+  void shouldWorkForCrossProcessIframes(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.CROSS_PROCESS_PREFIX + "/empty.html");
     ElementHandle elementHandle = page.querySelector("#frame1");
@@ -41,8 +41,8 @@ void shouldWorkForCrossProcessIframes() {
     assertEquals(page.frames().get(1), frame);
   }
 
-  @Test
-  void shouldWorkForCrossFrameEvaluations() {
+  @PlaywrightTest
+  void shouldWorkForCrossFrameEvaluations(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     Frame frame = page.frames().get(1);
@@ -52,8 +52,8 @@ void shouldWorkForCrossFrameEvaluations() {
     assertEquals(frame, elementHandle.contentFrame());
   }
 
-  @Test
-  void shouldReturnNullForNonIframes() {
+  @PlaywrightTest
+  void shouldReturnNullForNonIframes(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     Frame frame = page.frames().get(1);
@@ -63,8 +63,8 @@ void shouldReturnNullForNonIframes() {
     assertNull(elementHandle.contentFrame());
   }
 
-  @Test
-  void shouldReturnNullForDocumentDocumentElement() {
+  @PlaywrightTest
+  void shouldReturnNullForDocumentDocumentElement(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     Frame frame = page.frames().get(1);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java
index 90322262f..cd6a26bd7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java
@@ -16,15 +16,15 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.Collections;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleConvenience extends TestBase {
-  @Test
-  void shouldHaveANicePreview() {
+public class TestElementHandleConvenience {
+  @PlaywrightTest
+  void shouldHaveANicePreview(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     ElementHandle outer = page.querySelector("#outer");
     ElementHandle inner = page.querySelector("#inner");
@@ -37,8 +37,8 @@ void shouldHaveANicePreview() {
     assertEquals("JSHandle@<input checked id=\"check\" foo=\"bar\"\" type=\"checkbox\"/>", check.toString());
   }
 
-  @Test
-  void shouldHaveANicePreviewForNonAsciiAttributesChildren() {
+  @PlaywrightTest
+  void shouldHaveANicePreviewForNonAsciiAttributesChildren(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     String text = String.join("", Collections.nCopies(100, "😛"));
     page.setContent("<div title='" + text + "'>" + text + "</div>");
@@ -48,8 +48,8 @@ void shouldHaveANicePreviewForNonAsciiAttributesChildren() {
     assertEquals("JSHandle@<div title=\"😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛\">😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…</div>", handle.toString());
   }
 
-  @Test
-  void getAttributeShouldWork() {
+  @PlaywrightTest
+  void getAttributeShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     ElementHandle handle = page.querySelector("#outer");
     assertEquals("value", handle.getAttribute("name"));
@@ -58,8 +58,8 @@ void getAttributeShouldWork() {
     assertNull(page.getAttribute("#outer", "foo"));
   }
 
-  @Test
-  void inputValueShouldWork() {
+  @PlaywrightTest
+  void inputValueShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
 
     page.fill("#textarea", "text value");
@@ -78,24 +78,24 @@ void inputValueShouldWork() {
     assertTrue(e.getMessage().contains("Node is not an <input>, <textarea> or <select> element"), e.getMessage());
   }
 
-  @Test
-  void innerHTMLShouldWork() {
+  @PlaywrightTest
+  void innerHTMLShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     ElementHandle handle = page.querySelector("#outer");
     assertEquals("<div id=\"inner\">Text,\nmore text</div>", handle.innerHTML());
     assertEquals("<div id=\"inner\">Text,\nmore text</div>", page.innerHTML("#outer"));
   }
 
-  @Test
-  void innerTextShouldWork() {
+  @PlaywrightTest
+  void innerTextShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     ElementHandle handle = page.querySelector("#inner");
     assertEquals("Text, more text", handle.innerText());
     assertEquals("Text, more text", page.innerText("#inner"));
   }
 
-  @Test
-  void innerTextShouldThrow() {
+  @PlaywrightTest
+  void innerTextShouldThrow(Page page) {
     page.setContent("<svg>text</svg>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.innerText("svg"));
     assertTrue(e.getMessage().contains("Node is not an HTMLElement"), e.getMessage());
@@ -104,16 +104,16 @@ void innerTextShouldThrow() {
     assertTrue(e.getMessage().contains("Node is not an HTMLElement"), e.getMessage());
   }
 
-  @Test
-  void textContentShouldWork() {
+  @PlaywrightTest
+  void textContentShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     ElementHandle handle = page.querySelector("#inner");
     assertEquals("Text,\nmore text", handle.textContent());
     assertEquals("Text,\nmore text", page.textContent("#inner"));
   }
 
-  @Test
-  void textContentShouldBeAtomic() {
+  @PlaywrightTest
+  void textContentShouldBeAtomic(Page page, Playwright playwright) {
     String createDummySelector = "{\n" +
       "  query(root, selector) {\n" +
       "    const result = root.querySelector(selector);\n" +
@@ -135,8 +135,8 @@ void textContentShouldBeAtomic() {
     assertEquals("modified", page.evaluate("() => document.querySelector('div').textContent"));
   }
 
-  @Test
-  void innerTextShouldBeAtomic() {
+  @PlaywrightTest
+  void innerTextShouldBeAtomic(Page page, Playwright playwright) {
     String createDummySelector = "{\n" +
       "  query(root, selector) {\n" +
       "    const result = root.querySelector(selector);\n" +
@@ -158,8 +158,8 @@ void innerTextShouldBeAtomic() {
     assertEquals("modified", page.evaluate("() => document.querySelector('div').innerText"));
   }
 
-  @Test
-  void innerHTMLShouldBeAtomic() {
+  @PlaywrightTest
+  void innerHTMLShouldBeAtomic(Page page, Playwright playwright) {
     String createDummySelector = "{\n" +
       "  query(root, selector) {\n" +
       "    const result = root.querySelector(selector);\n" +
@@ -181,8 +181,8 @@ void innerHTMLShouldBeAtomic() {
     assertEquals("modified", page.evaluate("() => document.querySelector('div').innerHTML"));
   }
 
-  @Test
-  void getAttributeShouldBeAtomic() {
+  @PlaywrightTest
+  void getAttributeShouldBeAtomic(Page page, Playwright playwright) {
     String createDummySelector = "{\n" +
       "  query(root, selector) {\n" +
       "    const result = root.querySelector(selector);\n" +
@@ -204,8 +204,8 @@ void getAttributeShouldBeAtomic() {
     assertEquals("modified", page.evaluate("() => document.querySelector('div').getAttribute('foo')"));
   }
 
-  @Test
-  void isVisibleAndIsHiddenShouldWork() {
+  @PlaywrightTest
+  void isVisibleAndIsHiddenShouldWork(Page page) {
     page.setContent("<div>Hi</div><span></span>");
     ElementHandle div = page.querySelector("div");
     assertTrue(div.isVisible());
@@ -219,8 +219,8 @@ void isVisibleAndIsHiddenShouldWork() {
     assertTrue(page.isHidden("span"));
   }
 
-  @Test
-  void isEnabledAndIsDisabledShouldWork() {
+  @PlaywrightTest
+  void isEnabledAndIsDisabledShouldWork(Page page) {
     page.setContent(" <button disabled>button1</button>\n" +
       "<button>button2</button>\n" +
       "<div>div</div>");
@@ -241,8 +241,8 @@ void isEnabledAndIsDisabledShouldWork() {
     assertFalse(page.isDisabled(":text('button2')"));
   }
 
-  @Test
-  void isEditableShouldWork() {
+  @PlaywrightTest
+  void isEditableShouldWork(Page page) {
     page.setContent("<input id=input1 disabled><textarea></textarea><input id=input2>");
     page.evalOnSelector("textarea", "t => t.readOnly = true");
     ElementHandle input1 = page.querySelector("#input1");
@@ -256,8 +256,8 @@ void isEditableShouldWork() {
     assertFalse(page.isEditable("textarea"));
   }
 
-  @Test
-  void isCheckedShouldWork() {
+  @PlaywrightTest
+  void isCheckedShouldWork(Page page) {
     page.setContent("<input type='checkbox' checked><div>Not a checkbox</div>");
     ElementHandle handle = page.querySelector("input");
     assertTrue(handle.isChecked());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleMisc.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleMisc.java
index 695da49c2..423a68bdb 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleMisc.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleMisc.java
@@ -16,23 +16,23 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class TestElementHandleMisc extends TestBase {
-  @Test
-  void shouldHover() {
+public class TestElementHandleMisc {
+  @PlaywrightTest
+  void shouldHover(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/scrollable.html");
     ElementHandle button = page.querySelector("#button-6");
     button.hover();
     assertEquals("button-6", page.evaluate("document.querySelector('button:hover').id"));
   }
 
-  @Test
-  void shouldHoverWhenNodeIsRemoved() {
+  @PlaywrightTest
+  void shouldHoverWhenNodeIsRemoved(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/scrollable.html");
     page.evaluate("() => delete window['Node']");
     ElementHandle button = page.querySelector("#button-6");
@@ -40,16 +40,16 @@ void shouldHoverWhenNodeIsRemoved() {
     assertEquals("button-6", page.evaluate("document.querySelector('button:hover').id"));
   }
 
-  @Test
-  void shouldFillInput() {
+  @PlaywrightTest
+  void shouldFillInput(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle handle = page.querySelector("input");
     handle.fill("some value");
     assertEquals("some value", page.evaluate("window['result']"));
   }
 
-  @Test
-  void shouldFillInputWhenNodeIsRemoved() {
+  @PlaywrightTest
+  void shouldFillInputWhenNodeIsRemoved(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.evaluate("() => delete window['Node']");
     ElementHandle handle = page.querySelector("input");
@@ -57,24 +57,24 @@ void shouldFillInputWhenNodeIsRemoved() {
     assertEquals("some value", page.evaluate("window['result']"));
   }
 
-  @Test
-  void shouldCheckTheBox() {
+  @PlaywrightTest
+  void shouldCheckTheBox(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     ElementHandle input = page.querySelector("input");
     input.check();
     assertEquals(true, page.evaluate("checkbox.checked"));
   }
 
-  @Test
-  void shouldUncheckTheBox() {
+  @PlaywrightTest
+  void shouldUncheckTheBox(Page page) {
     page.setContent("<input id='checkbox' type='checkbox' checked></input>");
     ElementHandle input = page.querySelector("input");
     input.uncheck();
     assertEquals(false, page.evaluate("checkbox.checked"));
   }
 
-  @Test
-  void shouldSelectSingleOption() {
+  @PlaywrightTest
+  void shouldSelectSingleOption(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     ElementHandle select = page.querySelector("select");
     select.selectOption("blue");
@@ -82,8 +82,8 @@ void shouldSelectSingleOption() {
     assertEquals(asList("blue"), page.evaluate("window['result'].onChange"));
   }
 
-  @Test
-  void shouldFocusAButton() {
+  @PlaywrightTest
+  void shouldFocusAButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     assertEquals(false, button.evaluate("button => document.activeElement === button"));
@@ -91,8 +91,8 @@ void shouldFocusAButton() {
     assertEquals(true, button.evaluate("button => document.activeElement === button"));
   }
 
-  @Test
-  void shouldCheckTheBoxUsingSetChecked() {
+  @PlaywrightTest
+  void shouldCheckTheBoxUsingSetChecked(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     ElementHandle input = page.querySelector("input");
     input.setChecked(true);
@@ -101,16 +101,16 @@ void shouldCheckTheBoxUsingSetChecked() {
     assertEquals(false, page.evaluate("checkbox.checked"));
   }
 
-  @Test
-  void shouldFallBackToSelectingByLabel() {
+  @PlaywrightTest
+  void shouldFallBackToSelectingByLabel(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.querySelector("select").selectOption("Blue");
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldAllowDisposingTwice() {
+  @PlaywrightTest
+  void shouldAllowDisposingTwice(Page page) {
     page.setContent("<section>39</section>");
     ElementHandle element = page.querySelector("section");
     assertNotNull(element);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java
index 157202980..9378cd648 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleOwnerFrame.java
@@ -16,16 +16,16 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
-import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.Utils.attachFrame;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class TestElementHandleOwnerFrame extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestElementHandleOwnerFrame {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     Frame frame = page.frames().get(1);
@@ -35,8 +35,8 @@ void shouldWork() {
     assertEquals(frame, elementHandle.ownerFrame());
   }
 
-  @Test
-  void shouldWorkForCrossProcessIframes() {
+  @PlaywrightTest
+  void shouldWorkForCrossProcessIframes(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.CROSS_PROCESS_PREFIX + "/empty.html");
     Frame frame = page.frames().get(1);
@@ -46,8 +46,8 @@ void shouldWorkForCrossProcessIframes() {
     assertEquals(frame, elementHandle.ownerFrame());
   }
 
-  @Test
-  void shouldWorkForDocument() {
+  @PlaywrightTest
+  void shouldWorkForDocument(Page page, Server server) {
     // TODO: test.flaky(platform === "win32" && browserName === "webkit");
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
@@ -58,8 +58,8 @@ void shouldWorkForDocument() {
     assertEquals(frame, elementHandle.ownerFrame());
   }
 
-  @Test
-  void shouldWorkForIframeElements() {
+  @PlaywrightTest
+  void shouldWorkForIframeElements(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     Frame frame = page.mainFrame();
@@ -69,8 +69,8 @@ void shouldWorkForIframeElements() {
     assertEquals(frame, elementHandle.ownerFrame());
   }
 
-  @Test
-  void shouldWorkForCrossFrameEvaluations() {
+  @PlaywrightTest
+  void shouldWorkForCrossFrameEvaluations(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.EMPTY_PAGE);
     Frame frame = page.mainFrame();
@@ -78,8 +78,8 @@ void shouldWorkForCrossFrameEvaluations() {
     assertEquals(frame.childFrames().get(0), elementHandle.asElement().ownerFrame());
   }
 
-  @Test
-  void shouldWorkForDetachedElements() {
+  @PlaywrightTest
+  void shouldWorkForDetachedElements(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     JSHandle divHandle = page.evaluateHandle("() => {\n" +
       "  const div = document.createElement('div');\n" +
@@ -94,8 +94,8 @@ void shouldWorkForDetachedElements() {
     assertEquals(page.mainFrame(), divHandle.asElement().ownerFrame());
 }
 
-  @Test
-  void shouldWorkForAdoptedElements() {
+  @PlaywrightTest
+  void shouldWorkForAdoptedElements(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Page popup = page.waitForPopup(() -> page.evaluate("url => window['__popup'] = window.open(url)", server.EMPTY_PAGE));
     JSHandle divHandle = page.evaluateHandle("() => {\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandlePress.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandlePress.java
index 46f59fbbd..83eb1786d 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandlePress.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandlePress.java
@@ -16,28 +16,30 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestElementHandlePress extends TestBase {
+public class TestElementHandlePress {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     page.setContent("<input type='text' />");
     page.press("input", "h");
     assertEquals("h", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldNotSelectExistingValue() {
+  @PlaywrightTest
+  void shouldNotSelectExistingValue(Page page) {
     page.setContent("<input type='text' value='hello' />");
     page.press("input", "w");
     assertEquals("whello", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldResetSelectionWhenNotFocused() {
+  @PlaywrightTest
+  void shouldResetSelectionWhenNotFocused(Page page) {
     page.setContent("<input type='text' value='hello' /><div tabIndex=2>text</div>");
     page.evalOnSelector("input", "input => {\n" +
       "    input.selectionStart = 2;\n" +
@@ -48,8 +50,8 @@ void shouldResetSelectionWhenNotFocused() {
     assertEquals("whello", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldNotModifySelectionWhenFocused() {
+  @PlaywrightTest
+  void shouldNotModifySelectionWhenFocused(Page page) {
     page.setContent("<input type='text' value='hello' />");
     page.evalOnSelector("input", "input => {\n" +
       "    input.focus();\n" +
@@ -60,10 +62,10 @@ void shouldNotModifySelectionWhenFocused() {
     assertEquals("hewo", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldWorkWithNumberInput() {
+  @PlaywrightTest
+  void shouldWorkWithNumberInput(Page page, BrowserName browserName) {
     page.setContent("<input type='number' value=2 />");
     page.press("input", "1");
-    assertEquals(isWebKit() ? "1" : "12", page.evalOnSelector("input", "input => input.value"));
+    assertEquals(browserName == WEBKIT ? "1" : "12", page.evalOnSelector("input", "input => input.value"));
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java
index c4604a525..f83af6cab 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleQuerySelector.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleQuerySelector extends TestBase {
-  @Test
-  void shouldQueryExistingElement() {
+public class TestElementHandleQuerySelector {
+  @PlaywrightTest
+  void shouldQueryExistingElement(Page page, Server server) {
     page.navigate(server.PREFIX + "/playground.html");
     page.setContent("<html><body><div class=\"second\"><div class=\"inner\">A</div></div></body></html>");
     ElementHandle html = page.querySelector("html");
@@ -37,16 +37,16 @@ void shouldQueryExistingElement() {
     assertEquals( "A", content);
   }
 
-  @Test
-  void shouldReturnNullForNonExistingElement() {
+  @PlaywrightTest
+  void shouldReturnNullForNonExistingElement(Page page) {
     page.setContent("<html><body><div class=\"second\"><div class=\"inner\">B</div></div></body></html>");
     ElementHandle html = page.querySelector("html");
     ElementHandle second = html.querySelector(".third");
     assertNull(second);
   }
 
-  @Test
-  void shouldWorkForAdoptedElements() {
+  @PlaywrightTest
+  void shouldWorkForAdoptedElements(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Page popup = page.waitForPopup(() -> page.evaluate(
       "url => window['__popup'] = window.open(url)", server.EMPTY_PAGE));
@@ -73,8 +73,8 @@ void shouldWorkForAdoptedElements() {
     assertEquals("hello", popup.querySelector("span").evaluate("e => e.textContent"));
   }
 
-  @Test
-  void shouldQueryExistingElements() {
+  @PlaywrightTest
+  void shouldQueryExistingElements(Page page) {
     page.setContent("<html><body><div>A</div><br/><div>B</div></body></html>");
     ElementHandle html = page.querySelector("html");
     List<ElementHandle> elements = html.querySelectorAll("div");
@@ -84,16 +84,16 @@ void shouldQueryExistingElements() {
     assertTrue(Arrays.asList("A", "B").equals(result));
   }
 
-  @Test
-  void shouldReturnEmptyArrayForNonExistingElement() {
+  @PlaywrightTest
+  void shouldReturnEmptyArrayForNonExistingElement(Page page) {
     page.setContent("<html><body><span>A</span><br/><span>B</span></body></html>");
     ElementHandle html = page.querySelector("html");
     List<ElementHandle> elements = html.querySelectorAll("div");
     assertEquals(0, elements.size());
   }
 
-  @Test
-  void xpathShouldQueryExistingElement() {
+  @PlaywrightTest
+  void xpathShouldQueryExistingElement(Page page, Server server) {
     page.navigate(server.PREFIX + "/playground.html");
     page.setContent("<html><body><div class=\"second\"><div class=\"inner\">A</div></div></body></html>");
     ElementHandle html = page.querySelector("html");
@@ -103,8 +103,8 @@ void xpathShouldQueryExistingElement() {
     assertEquals("A", content);
   }
 
-  @Test
-  void xpathShouldReturnNullForNonExistingElement() {
+  @PlaywrightTest
+  void xpathShouldReturnNullForNonExistingElement(Page page) {
     page.setContent("<html><body><div class=\"second\"><div class=\"inner\">B</div></div></body></html>");
     ElementHandle html = page.querySelector("html");
     List<ElementHandle> second = html.querySelectorAll("xpath=/div[contains(@class, 'third')]");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleSelectText.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleSelectText.java
index 7972d6771..d69cf67ce 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleSelectText.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleSelectText.java
@@ -16,19 +16,22 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Test;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleSelectText extends TestBase {
+public class TestElementHandleSelectText {
 
-  @Test
-  void shouldSelectTextarea() {
+  @PlaywrightTest
+  void shouldSelectTextarea(Page page, Server server, BrowserName browserName) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle textarea = page.querySelector("textarea");
     textarea.evaluate("textarea => textarea.value = 'some value'");
     textarea.selectText();
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals(0, textarea.evaluate("el => el.selectionStart"));
       assertEquals(10, textarea.evaluate("el => el.selectionEnd"));
     } else {
@@ -36,13 +39,13 @@ void shouldSelectTextarea() {
     }
   }
 
-  @Test
-  void shouldSelectInput() {
+  @PlaywrightTest
+  void shouldSelectInput(Page page, Server server, BrowserName browserName) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle input = page.querySelector("input");
     input.evaluate("input => input.value = 'some value'");
     input.selectText();
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals(0, input.evaluate("el => el.selectionStart"));
       assertEquals(10, input.evaluate("el => el.selectionEnd"));
     } else {
@@ -50,16 +53,16 @@ void shouldSelectInput() {
     }
   }
 
-  @Test
-  void shouldSelectPlainDiv() {
+  @PlaywrightTest
+  void shouldSelectPlainDiv(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle div = page.querySelector("div.plain");
     div.selectText();
     assertEquals("Plain div", page.evaluate("() => window.getSelection().toString()"));
   }
 
-  @Test
-  void shouldTimeoutWaitingForInvisibleElement() {
+  @PlaywrightTest
+  void shouldTimeoutWaitingForInvisibleElement(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle textarea = page.querySelector("textarea");
     textarea.evaluate("e => e.style.display = 'none'");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleType.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleType.java
index 9b1f9c0a9..3baeb97a0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleType.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleType.java
@@ -16,28 +16,30 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestElementHandleType extends TestBase {
+public class TestElementHandleType {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     page.setContent("<input type='text' />");
     page.type("input", "hello");
     assertEquals("hello", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldNotSelectExistingValue() {
+  @PlaywrightTest
+  void shouldNotSelectExistingValue(Page page) {
     page.setContent("<input type='text' value='hello' />");
     page.type("input", "world");
     assertEquals("worldhello", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldResetSelectionWhenNotFocus() {
+  @PlaywrightTest
+  void shouldResetSelectionWhenNotFocus(Page page) {
     page.setContent("<input type='text' value='hello' /><div tabIndex=2>text</div>");
     page.evalOnSelector("input", "input => {\n" +
       "    input.selectionStart = 2;\n" +
@@ -48,8 +50,8 @@ void shouldResetSelectionWhenNotFocus() {
     assertEquals("worldhello", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldNotModifySelectionWhenFocus() {
+  @PlaywrightTest
+  void shouldNotModifySelectionWhenFocus(Page page) {
     page.setContent("<input type='text' value='hello' />");
     page.evalOnSelector("input", "input => {\n" +
       "    input.focus();\n" +
@@ -60,10 +62,10 @@ void shouldNotModifySelectionWhenFocus() {
     assertEquals("heworldo", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldWorkWithNumberInput() {
+  @PlaywrightTest
+  void shouldWorkWithNumberInput(Page page, BrowserName browserName) {
     page.setContent("<input type='number' value=2 />");
     page.type("input", "13");
-    assertEquals(isWebKit() ? "13" : "132", page.evalOnSelector("input", "input => input.value"));
+    assertEquals(browserName == WEBKIT ? "13" : "132", page.evalOnSelector("input", "input => input.value"));
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java
index a0ed26327..6051c5581 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleWaitForElementState.java
@@ -16,13 +16,15 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import org.junit.jupiter.api.condition.OS;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static com.microsoft.playwright.options.ElementState.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestElementHandleWaitForElementState extends TestBase {
+public class TestElementHandleWaitForElementState {
 
   static void giveItAChanceToResolve(Page page) {
     for (int i = 0; i < 5; i++) {
@@ -30,8 +32,8 @@ static void giveItAChanceToResolve(Page page) {
     }
   }
 
-  @Test
-  void shouldWaitForVisible() {
+  @PlaywrightTest
+  void shouldWaitForVisible(Page page) {
     page.setContent("<div style='display:none'>content</div>");
     ElementHandle div = page.querySelector("div");
     giveItAChanceToResolve(page);
@@ -39,15 +41,15 @@ void shouldWaitForVisible() {
     div.waitForElementState(VISIBLE);
   }
 
-  @Test
-  void shouldWaitForAlreadyVisible() {
+  @PlaywrightTest
+  void shouldWaitForAlreadyVisible(Page page) {
     page.setContent("<div>content</div>");
     ElementHandle div = page.querySelector("div");
     div.waitForElementState(VISIBLE);
   }
 
-  @Test
-  void shouldTimeoutWaitingForVisible() {
+  @PlaywrightTest
+  void shouldTimeoutWaitingForVisible(Page page) {
     page.setContent("<div style='display:none'>content</div>");
     ElementHandle div = page.querySelector("div");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -56,8 +58,8 @@ void shouldTimeoutWaitingForVisible() {
     assertTrue(e.getMessage().contains("Timeout 1000ms exceeded"));
   }
 
-  @Test
-  void shouldThrowWaitingForVisibleWhenDetached() {
+  @PlaywrightTest
+  void shouldThrowWaitingForVisibleWhenDetached(Page page) {
     page.setContent("<div style='display:none'>content</div>");
     ElementHandle div = page.querySelector("div");
     div.evaluate("div => div.remove()");
@@ -65,8 +67,8 @@ void shouldThrowWaitingForVisibleWhenDetached() {
     assertTrue(e.getMessage().contains("Element is not attached to the DOM"));
   }
 
-  @Test
-  void shouldWaitForHidden() {
+  @PlaywrightTest
+  void shouldWaitForHidden(Page page) {
     page.setContent("<div>content</div>");
     ElementHandle div = page.querySelector("div");
     giveItAChanceToResolve(page);
@@ -74,15 +76,15 @@ void shouldWaitForHidden() {
     div.waitForElementState(HIDDEN);
   }
 
-  @Test
-  void shouldWaitForAlreadyHidden() {
+  @PlaywrightTest
+  void shouldWaitForAlreadyHidden(Page page) {
     page.setContent("<div></div>");
     ElementHandle div = page.querySelector("div");
     div.waitForElementState(HIDDEN);
   }
 
-  @Test
-  void shouldWaitForHiddenWhenDetached() {
+  @PlaywrightTest
+  void shouldWaitForHiddenWhenDetached(Page page) {
     page.setContent("<div>content</div>");
     ElementHandle div = page.querySelector("div");
     giveItAChanceToResolve(page);
@@ -90,8 +92,8 @@ void shouldWaitForHiddenWhenDetached() {
     div.waitForElementState(HIDDEN);
   }
 
-  @Test
-  void shouldWaitForEnabledButton() {
+  @PlaywrightTest
+  void shouldWaitForEnabledButton(Page page) {
     page.setContent("<button disabled><span>Target</span></button>");
     ElementHandle span = page.querySelector("text=Target");
     giveItAChanceToResolve(page);
@@ -99,8 +101,8 @@ void shouldWaitForEnabledButton() {
     span.waitForElementState(ENABLED);
   }
 
-  @Test
-  void shouldThrowWaitingForEnabledWhenDetached() {
+  @PlaywrightTest
+  void shouldThrowWaitingForEnabledWhenDetached(Page page) {
     page.setContent("<button disabled>Target</button>");
     ElementHandle button = page.querySelector("button");
     button.evaluate("button => button.remove()");
@@ -108,8 +110,8 @@ void shouldThrowWaitingForEnabledWhenDetached() {
     assertTrue(e.getMessage().contains("Element is not attached to the DOM"));
   }
 
-  @Test
-  void shouldWaitForDisabledButton() {
+  @PlaywrightTest
+  void shouldWaitForDisabledButton(Page page) {
     page.setContent("<button><span>Target</span></button>");
     ElementHandle span = page.querySelector("text=Target");
     giveItAChanceToResolve(page);
@@ -117,12 +119,9 @@ void shouldWaitForDisabledButton() {
     span.waitForElementState(DISABLED);
   }
 
-  static boolean isFirefoxLinux() {
-    return isFirefox() && Utils.getOS() == Utils.OS.LINUX;
-  }
-  @Test
-  @DisabledIf(value="isFirefoxLinux", disabledReason="fixme")
-  void shouldWaitForStablePosition() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, os = OS.LINUX, reason = "fixme")
+  void shouldWaitForStablePosition(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     ElementHandle button = page.querySelector("button");
     page.evalOnSelector("button", "button => {\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelector.java b/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelector.java
index 380ecb46a..c310c58b7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelector.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelector.java
@@ -16,145 +16,145 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.Arrays;
 import java.util.Collections;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestEvalOnSelector extends TestBase {
+public class TestEvalOnSelector {
 
-  @Test
-  void shouldWorkWithCssSelector() {
+  @PlaywrightTest
+  void shouldWorkWithCssSelector(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("css=section", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithIdSelector() {
+  @PlaywrightTest
+  void shouldWorkWithIdSelector(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("id=testAttribute", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithDataTestSelector() {
+  @PlaywrightTest
+  void shouldWorkWithDataTestSelector(Page page) {
     page.setContent("<section data-test=foo id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("data-test=foo", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithDataTestidSelector() {
+  @PlaywrightTest
+  void shouldWorkWithDataTestidSelector(Page page) {
     page.setContent("<section data-testid=foo id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("data-testid=foo", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithDataTestIdSelector() {
+  @PlaywrightTest
+  void shouldWorkWithDataTestIdSelector(Page page) {
     page.setContent("<section data-test-id=foo id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("data-test-id=foo", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithTextSelector1() {
+  @PlaywrightTest
+  void shouldWorkWithTextSelector1(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("text='43543'", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithXpathSelector() {
+  @PlaywrightTest
+  void shouldWorkWithXpathSelector(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("xpath=/html/body/section", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldWorkWithTextSelector2() {
+  @PlaywrightTest
+  void shouldWorkWithTextSelector2(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("text=43543", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldAutoDetectCssSelector() {
+  @PlaywrightTest
+  void shouldAutoDetectCssSelector(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("section", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldAutoDetectCssSelectorWithAttributes() {
+  @PlaywrightTest
+  void shouldAutoDetectCssSelectorWithAttributes(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("section[id='testAttribute']", "e => e.id");
     assertEquals("testAttribute", idAttribute);
   }
 
-  @Test
-  void shouldAutoDetectNestedSelectors() {
+  @PlaywrightTest
+  void shouldAutoDetectNestedSelectors(Page page) {
     page.setContent("<div foo=bar><section>43543<span>Hello<div id=target></div></span></section></div>");
     Object idAttribute = page.evalOnSelector("div[foo=bar] > section >> 'Hello' >> div", "e => e.id");
     assertEquals("target", idAttribute);
   }
 
-  @Test
-  void shouldAcceptArguments() {
+  @PlaywrightTest
+  void shouldAcceptArguments(Page page) {
     page.setContent("<section>hello</section>");
     Object text = page.evalOnSelector("section", "(e, suffix) => e.textContent + suffix", " world!");
     assertEquals("hello world!", text);
   }
 
-  @Test
-  void shouldAcceptElementHandlesAsArguments() {
+  @PlaywrightTest
+  void shouldAcceptElementHandlesAsArguments(Page page) {
     page.setContent("<section>hello</section><div> world</div>");
     ElementHandle divHandle = page.querySelector("div");
     Object text = page.evalOnSelector("section", "(e, div) => e.textContent + div.textContent", divHandle);
     assertEquals("hello world", text);
   }
 
-  @Test
-  void shouldThrowErrorIfNoElementIsFound() {
+  @PlaywrightTest
+  void shouldThrowErrorIfNoElementIsFound(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evalOnSelector("section", "e => e.id");
     });
     assertTrue(e.getMessage().contains("Failed to find element matching selector \"section\""), e.getMessage());
   }
 
-  @Test
-  void shouldSupportSyntax() {
+  @PlaywrightTest
+  void shouldSupportSyntax(Page page) {
     page.setContent("<section><div>hello</div></section>");
     Object text = page.evalOnSelector("css=section >> css=div", "(e, suffix) => e.textContent + suffix", " world!");
     assertEquals("hello world!", text);
   }
 
-  @Test
-  void shouldSupportSyntaxWithDifferentEngines() {
+  @PlaywrightTest
+  void shouldSupportSyntaxWithDifferentEngines(Page page) {
     page.setContent("<section><div><span>hello</span></div></section>");
     Object text = page.evalOnSelector("xpath=/html/body/section >> css=div >> text='hello'", "(e, suffix) => e.textContent + suffix", " world!");
     assertEquals("hello world!", text);
   }
 
-  @Test
-  void shouldSupportSpacesWithSyntax() {
+  @PlaywrightTest
+  void shouldSupportSpacesWithSyntax(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     Object text = page.evalOnSelector(" css = div >>css=div>>css   = span  ", "e => e.textContent");
     assertEquals("Hello from root2", text);
   }
 
-  @Test
-  void shouldNotStopAtFirstFailureWithSyntax() {
+  @PlaywrightTest
+  void shouldNotStopAtFirstFailureWithSyntax(Page page) {
     page.setContent("<div><span>Next</span><button>Previous</button><button>Next</button></div>");
     Object html = page.evalOnSelector("button >> 'Next'", "e => e.outerHTML");
     assertEquals("<button>Next</button>", html);
   }
 
-  @Test
-  void shouldSupportCapture() {
+  @PlaywrightTest
+  void shouldSupportCapture(Page page) {
     page.setContent("<section><div><span>a</span></div></section><section><div><span>b</span></div></section>");
     assertEquals("<div><span>b</span></div>", page.evalOnSelector("*css=div >> 'b'", "e => e.outerHTML"));
     assertEquals("<div><span>b</span></div>", page.evalOnSelector("section >> *css=div >> 'b'", "e => e.outerHTML"));
@@ -162,24 +162,24 @@ void shouldSupportCapture() {
     assertNotNull(page.querySelector("*"));
   }
 
-  @Test
-  void shouldThrowOnMultipleCaptures() {
+  @PlaywrightTest
+  void shouldThrowOnMultipleCaptures(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evalOnSelector("*css=div >> *css=span", "e => e.outerHTML");
     });
     assertTrue(e.getMessage().contains("Only one of the selectors can capture using * modifier"));
   }
 
-  @Test
-  void shouldThrowOnMalformedCapture() {
+  @PlaywrightTest
+  void shouldThrowOnMalformedCapture(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evalOnSelector("*=div", "e => e.outerHTML");
     });
     assertTrue(e.getMessage().contains("Unknown engine \"\" while parsing selector *=div"));
   }
 
-  @Test
-  void shouldWorkWithSpacesInCssAttributes() {
+  @PlaywrightTest
+  void shouldWorkWithSpacesInCssAttributes(Page page) {
     page.setContent("<div><input placeholder='Select date'></div>");
     assertNotNull(page.waitForSelector("[placeholder=\"Select date\"]"));
     assertNotNull(page.waitForSelector("[placeholder='Select date']"));
@@ -201,8 +201,8 @@ void shouldWorkWithSpacesInCssAttributes() {
     assertEquals("<input placeholder=\"Select date\">", page.evalOnSelector("div >> [placeholder='Select date']", "e => e.outerHTML"));
   }
 
-  @Test
-  void shouldWorkWithQuotesInCssAttributes() {
+  @PlaywrightTest
+  void shouldWorkWithQuotesInCssAttributes(Page page) {
     page.setContent("<div><input placeholder=\"Select&quot;date\"></div>");
     assertNotNull(page.querySelector("[placeholder=\"Select\\\"date\"]"));
     assertNotNull(page.querySelector("[placeholder='Select\"date']"));
@@ -217,22 +217,22 @@ void shouldWorkWithQuotesInCssAttributes() {
     assertNotNull(page.querySelector("[placeholder='Select \\' date']"));
   }
 
-  @Test
-  void shouldWorkWithSpacesInCssAttributesWhenMissing() {
+  @PlaywrightTest
+  void shouldWorkWithSpacesInCssAttributesWhenMissing(Page page) {
     assertNull(page.querySelector("[placeholder='Select date']"));
     page.setContent("<div><input placeholder='Select date'></div>");
     page.waitForSelector("[placeholder='Select date']");
   }
 
-  @Test
-  void shouldWorkWithQuotesInCssAttributesWhenMissing() {
+  @PlaywrightTest
+  void shouldWorkWithQuotesInCssAttributesWhenMissing(Page page) {
     assertNull(page.querySelector("[placeholder='Select\\\"date']"));
     page.setContent("<div><input placeholder='Select&quot;date'></div>");
     page.waitForSelector("[placeholder='Select\\\"date']");
   }
 
-  @Test
-  void shouldReturnComplexValues() {
+  @PlaywrightTest
+  void shouldReturnComplexValues(Page page) {
     page.setContent("<section id='testAttribute'>43543</section>");
     Object idAttribute = page.evalOnSelector("css=section", "e => [{ id: e.id }]");
     assertEquals(Arrays.asList(Collections.singletonMap("id", "testAttribute")), idAttribute);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelectorAll.java b/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelectorAll.java
index ff257c9ef..8b1248b28 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelectorAll.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestEvalOnSelectorAll.java
@@ -16,50 +16,50 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestEvalOnSelectorAll extends TestBase {
+public class TestEvalOnSelectorAll {
 
-  @Test
-  void shouldWorkWithCssSelector() {
+  @PlaywrightTest
+  void shouldWorkWithCssSelector(Page page) {
     page.setContent("<div>hello</div><div>beautiful</div><div>world!</div>");
     Object divsCount = page.evalOnSelectorAll("css=div", "divs => divs.length");
     assertEquals(3, divsCount);
   }
 
-  @Test
-  void shouldWorkWithTextSelector() {
+  @PlaywrightTest
+  void shouldWorkWithTextSelector(Page page) {
     page.setContent("<div>hello</div><div>beautiful</div><div>beautiful</div><div>world!</div>");
     Object divsCount = page.evalOnSelectorAll("text='beautiful'", "divs => divs.length");
     assertEquals(2, divsCount);
   }
 
-  @Test
-  void shouldWorkWithXpathSelector() {
+  @PlaywrightTest
+  void shouldWorkWithXpathSelector(Page page) {
     page.setContent("<div>hello</div><div>beautiful</div><div>world!</div>");
     Object divsCount = page.evalOnSelectorAll("xpath=/html/body/div", "divs => divs.length");
     assertEquals(3, divsCount);
   }
 
-  @Test
-  void shouldAutoDetectCssSelector() {
+  @PlaywrightTest
+  void shouldAutoDetectCssSelector(Page page) {
     page.setContent("<div>hello</div><div>beautiful</div><div>world!</div>");
     Object divsCount = page.evalOnSelectorAll("div", "divs => divs.length");
     assertEquals(3, divsCount);
   }
 
-  @Test
-  void shouldSupportSyntax() {
+  @PlaywrightTest
+  void shouldSupportSyntax(Page page) {
     page.setContent("<div><span>hello</span></div><div>beautiful</div><div><span>wo</span><span>rld!</span></div><span>Not this one</span>");
     Object spansCount = page.evalOnSelectorAll("css=div >> css=span", "spans => spans.length");
     assertEquals(3, spansCount);
   }
-  @Test
-  void shouldSupportCapture() {
+  @PlaywrightTest
+  void shouldSupportCapture(Page page) {
     page.setContent("<section><div><span>a</span></div></section><section><div><span>b</span></div></section>");
     assertEquals(1, page.evalOnSelectorAll("*css=div >> 'b'", "els => els.length"));
     assertEquals(1, page.evalOnSelectorAll("section >> *css=div >> 'b'", "els => els.length"));
@@ -74,16 +74,16 @@ void shouldSupportCapture() {
     assertEquals(1, page.evalOnSelectorAll("section >> *css=div >> 'a'", "els => els.length"));
   }
 
-  @Test
-  void shouldSupportCaptureWhenMultiplePathsMatch() {
+  @PlaywrightTest
+  void shouldSupportCaptureWhenMultiplePathsMatch(Page page) {
     page.setContent("<div><div><span></span></div></div><div></div>");
     assertEquals(2, page.evalOnSelectorAll("*css=div >> span", "els => els.length"));
     page.setContent("<div><div><span></span></div><span></span><span></span></div><div></div>");
     assertEquals(2, page.evalOnSelectorAll("*css=div >> span", "els => els.length"));
   }
 
-  @Test
-  void shouldReturnComplexValues() {
+  @PlaywrightTest
+  void shouldReturnComplexValues(Page page) {
     page.setContent("<div>hello</div><div>beautiful</div><div>world!</div>");
     Object texts = page.evalOnSelectorAll("css=div", "divs => divs.map(div => div.textContent)");
     assertEquals(Arrays.asList("hello", "beautiful", "world!"), texts);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestExpectMisc.java b/playwright/src/test/java/com/microsoft/playwright/TestExpectMisc.java
index 9c9790101..d348c046b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestExpectMisc.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestExpectMisc.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.opentest4j.AssertionFailedError;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
@@ -24,9 +24,9 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestExpectMisc extends TestBase {
-  @Test
-  void strictModeViolationErrorFormat() {
+public class TestExpectMisc {
+  @PlaywrightTest
+  void strictModeViolationErrorFormat(Page page) {
     page.setContent(" <div>hello</div><div>hi</div>");
     AssertionFailedError error = assertThrows(AssertionFailedError.class, () ->
       assertThat(page.locator("div")).isVisible());
@@ -34,8 +34,8 @@ void strictModeViolationErrorFormat() {
     assertTrue(error.getMessage().contains("Error: strict mode violation: locator(\"div\") resolved to 2 elements:"), error.getMessage());
   }
 
-  @Test
-  void invalidSelectorErrorFormat() {
+  @PlaywrightTest
+  void invalidSelectorErrorFormat(Page page) {
     page.setContent("<div>hello</div><div>hi</div>");
     AssertionFailedError error = assertThrows(AssertionFailedError.class, () ->
       assertThat(page.locator("##")).isVisible());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestFirefoxLauncher.java b/playwright/src/test/java/com/microsoft/playwright/TestFirefoxLauncher.java
index b9878ccf3..e685a4e7b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestFirefoxLauncher.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestFirefoxLauncher.java
@@ -16,55 +16,44 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.nio.file.Path;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static org.junit.jupiter.api.Assertions.*;
 
-@EnabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip")
-public class TestFirefoxLauncher extends TestBase {
-
-  @Override
-  @BeforeAll
-  // Hide base class method to not launch browser.
-  void launchBrowser() {
-  }
-
-  @Override
-  void createContextAndPage() {
-    // Do nothing
-  }
-
-  @Test
-  void shouldPassFirefoxUserPreferences() {
+@EnabledOnBrowser(value = FIREFOX, reason = "skip")
+public class TestFirefoxLauncher {
+  @PlaywrightTest
+  void shouldPassFirefoxUserPreferences(BrowserType browserType) {
     BrowserType.LaunchOptions options = new BrowserType.LaunchOptions().setFirefoxUserPrefs(
       mapOf(
         "network.proxy.type", 1,
         "network.proxy.http", "127.0.0.1",
         "network.proxy.http_port", 3333));
-    launchBrowser(options);
-    Page page = browser.newPage();
-    PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate("http://example.com"));
-    assertTrue(e.getMessage().contains("NS_ERROR_PROXY_CONNECTION_REFUSED"));
+    try (Browser browser = browserType.launch(options)) {
+      Page page = browser.newPage();
+      PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate("http://example.com"));
+      assertTrue(e.getMessage().contains("NS_ERROR_PROXY_CONNECTION_REFUSED"));
+    }
   }
 
-  @Test
-  void shouldPassFirefoxUserPreferencesInPersistent(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldPassFirefoxUserPreferencesInPersistent(BrowserType browserType, @TempDir Path tmpDir) {
     BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions().setFirefoxUserPrefs(
       mapOf(
         "network.proxy.type", 1,
         "network.proxy.http", "127.0.0.1",
         "network.proxy.http_port", 3333));
-    initBrowserType();
-    context = browserType.launchPersistentContext(tmpDir.resolve("user-data-dir"), options);
-    assertNotNull(context);
-    Page page = context.pages().get(0);
-    PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate("http://example.com"));
-    assertTrue(e.getMessage().contains("NS_ERROR_PROXY_CONNECTION_REFUSED"));
+    try (BrowserContext context = browserType.launchPersistentContext(tmpDir.resolve("user-data-dir"), options)) {
+      assertNotNull(context);
+      Page page = context.pages().get(0);
+      PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate("http://example.com"));
+      assertTrue(e.getMessage().contains("NS_ERROR_PROXY_CONNECTION_REFUSED"));
+    }
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java b/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java
index 5a1d00d55..1504d8d62 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestFrameNavigate.java
@@ -16,15 +16,15 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static com.microsoft.playwright.options.WaitUntilState.NETWORKIDLE;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestFrameNavigate extends TestBase {
+public class TestFrameNavigate {
 
-  @Test
-  void shouldNavigateSubframes() {
+  @PlaywrightTest
+  void shouldNavigateSubframes(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     assertTrue(page.frames().get(0).url().contains("/frames/one-frame.html"));
     assertTrue(page.frames().get(1).url().contains("/frames/frame.html"));
@@ -38,8 +38,8 @@ void shouldNavigateSubframes() {
   void shouldRejectWhenFrameDetaches() {
   }
 
-  @Test
-  void shouldContinueAfterClientRedirect() {
+  @PlaywrightTest
+  void shouldContinueAfterClientRedirect(Page page, Server server) {
     server.setRoute("/frames/script.js", (httpExchange) -> {});
     String url = server.PREFIX + "/frames/child-redirect.html";
     TimeoutError e = assertThrows(TimeoutError.class, () ->  {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java b/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java
index 4b6829f61..ac3930c18 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestGeolocation.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Geolocation;
-import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,9 +26,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestGeolocation extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestGeolocation {
+  @PlaywrightTest
+  void shouldWork(Page page, BrowserContext context, Server server) {
     context.grantPermissions(asList("geolocation"));
     page.navigate(server.EMPTY_PAGE);
     context.setGeolocation(new Geolocation(10, 10));
@@ -38,16 +38,16 @@ void shouldWork() {
     assertEquals(mapOf("latitude", 10, "longitude", 10), geolocation);
   }
 
-  @Test
-  void shouldThrowWhenInvalidLongitude() {
+  @PlaywrightTest
+  void shouldThrowWhenInvalidLongitude(BrowserContext context) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       context.setGeolocation(new Geolocation(10, 200));
     });
     assertTrue(e.getMessage().contains("geolocation.longitude: precondition -180 <= LONGITUDE <= 180 failed."));
   }
 
-  @Test
-  void shouldIsolateContexts() {
+  @PlaywrightTest
+  void shouldIsolateContexts(Page page, BrowserContext context, Browser browser, Server server) {
     context.grantPermissions(asList("geolocation"));
     context.setGeolocation(new Geolocation(10, 10));
     page.navigate(server.EMPTY_PAGE);
@@ -74,8 +74,8 @@ void shouldThrowWithMissingLatitude() {
     // Not applicable in Java.
   }
 
-  @Test
-  void shouldNotModifyPassedDefaultOptionsObject() {
+  @PlaywrightTest
+  void shouldNotModifyPassedDefaultOptionsObject(Browser browser) {
     Geolocation geolocation = new Geolocation(10, 10);
     Browser.NewContextOptions options = new Browser.NewContextOptions().setGeolocation(geolocation);
     BrowserContext context = browser.newContext(options);
@@ -88,8 +88,8 @@ void shouldThrowWithMissingLongitudeInDefaultOptions() {
     // Not applicable in Java.
   }
 
-  @Test
-  void shouldUseContextOptions() {
+  @PlaywrightTest
+  void shouldUseContextOptions(Browser browser, Server server) {
     Browser.NewContextOptions options = new Browser.NewContextOptions()
       .setGeolocation(new Geolocation(10, 10))
       .setPermissions(asList("geolocation"));
@@ -103,8 +103,8 @@ void shouldUseContextOptions() {
     context.close();
   }
 
-  @Test
-  void watchPositionShouldBeNotified() {
+  @PlaywrightTest
+  void watchPositionShouldBeNotified(Page page, BrowserContext context, Server server) {
     context.grantPermissions(asList("geolocation"));
     page.navigate(server.EMPTY_PAGE);
     List<String> messages = new ArrayList<>();
@@ -143,8 +143,8 @@ void watchPositionShouldBeNotified() {
     assertTrue(messages.contains("lat=40 lng=50"));
   }
 
-  @Test
-  void shouldUseContextOptionsForPopup() {
+  @PlaywrightTest
+  void shouldUseContextOptionsForPopup(Page page, BrowserContext context, Server server) {
     context.grantPermissions(asList("geolocation"));
     context.setGeolocation(new Geolocation(10, 10));
     Page popup = page.waitForPopup(() -> page.evaluate(
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java b/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java
index 3e5d10991..943db133d 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestGlobalFetch.java
@@ -18,6 +18,7 @@
 
 import com.google.gson.Gson;
 import com.microsoft.playwright.APIRequest.NewContextOptions;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Cookie;
 import com.microsoft.playwright.options.HttpCredentials;
 import com.microsoft.playwright.options.HttpCredentialsSend;
@@ -26,7 +27,6 @@
 import com.microsoft.playwright.options.SameSiteAttribute;
 import com.microsoft.playwright.options.ServerAddr;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.io.Writer;
@@ -42,11 +42,11 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestGlobalFetch extends TestBase {
+public class TestGlobalFetch {
   private static final List<String> HTTP_METHODS = asList("GET", "PUT", "POST", "OPTIONS", "HEAD", "PATCH");
 
-  @Test
-  void shouldHaveJavaInDefaultUesrAgent() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldHaveJavaInDefaultUesrAgent(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions());
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
     APIResponse response = request.get(server.EMPTY_PAGE);
@@ -64,8 +64,8 @@ void shouldHaveJavaInDefaultUesrAgent() throws ExecutionException, InterruptedEx
     assertTrue(serverRequest.get().headers.get("user-agent").get(0).contains("java/" + version));
   }
 
-  @Test
-  void fetchShouldWork() {
+  @PlaywrightTest
+  void fetchShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.fetch(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
@@ -79,8 +79,8 @@ void fetchShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void deleteShouldWork() {
+  @PlaywrightTest
+  void deleteShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.delete(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
@@ -94,8 +94,8 @@ void deleteShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void getShouldWork() {
+  @PlaywrightTest
+  void getShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
@@ -109,8 +109,8 @@ void getShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void headShouldWork() {
+  @PlaywrightTest
+  void headShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.head(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, response.url());
@@ -124,8 +124,8 @@ void headShouldWork() {
     assertEquals("", response.text());
   }
 
-  @Test
-  void patchShouldWork() {
+  @PlaywrightTest
+  void patchShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.patch(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
@@ -139,8 +139,8 @@ void patchShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void postShouldWork() {
+  @PlaywrightTest
+  void postShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.post(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
@@ -154,8 +154,8 @@ void postShouldWork() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void putShouldWork() {
+  @PlaywrightTest
+  void putShouldWork(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.put(server.PREFIX + "/simple.json");
     assertEquals(server.PREFIX + "/simple.json", response.url());
@@ -177,8 +177,8 @@ private static List<String> sortedCookieValues(APIRequestContext request) {
     return request.cookies().stream().map(c -> c.value).sorted().collect(Collectors.toList());
   }
 
-  @Test
-  void addCookiesShouldAddCookiesToTheCookieJar() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void addCookiesShouldAddCookiesToTheCookieJar(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     request.addCookies(asList(
       new Cookie("a", "b").setUrl(server.EMPTY_PAGE),
@@ -200,16 +200,16 @@ void addCookiesShouldAddCookiesToTheCookieJar() throws ExecutionException, Inter
     request.dispose();
   }
 
-  @Test
-  void addCookiesShouldValidateCookies() {
+  @PlaywrightTest
+  void addCookiesShouldValidateCookies(Playwright playwright) {
     APIRequestContext request = playwright.request().newContext();
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> request.addCookies(asList(new Cookie("a", "b"))));
     assertTrue(e.getMessage().contains("Cookie should have a url or a domain/path pair"), e.getMessage());
     request.dispose();
   }
 
-  @Test
-  void cookiesShouldReturnCookiesFilteredByUrls() {
+  @PlaywrightTest
+  void cookiesShouldReturnCookiesFilteredByUrls(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     request.addCookies(asList(
       new Cookie("a", "b").setDomain("localhost").setPath("/"),
@@ -225,8 +225,8 @@ void cookiesShouldReturnCookiesFilteredByUrls() {
     request.dispose();
   }
 
-  @Test
-  void clearCookiesShouldRemoveAllCookies() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void clearCookiesShouldRemoveAllCookies(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     request.addCookies(asList(
       new Cookie("a", "b").setUrl(server.EMPTY_PAGE),
@@ -239,8 +239,8 @@ void clearCookiesShouldRemoveAllCookies() throws ExecutionException, Interrupted
     request.dispose();
   }
 
-  @Test
-  void clearCookiesShouldFilterByNameDomainAndPath() {
+  @PlaywrightTest
+  void clearCookiesShouldFilterByNameDomainAndPath(Playwright playwright) {
     APIRequestContext request = playwright.request().newContext();
     request.addCookies(asList(
       new Cookie("session", "1").setDomain("one.com").setPath("/"),
@@ -259,8 +259,8 @@ void clearCookiesShouldFilterByNameDomainAndPath() {
     request.dispose();
   }
 
-  @Test
-  void shouldDisposeGlobalRequest() {
+  @PlaywrightTest
+  void shouldDisposeGlobalRequest(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(server.PREFIX + "/simple.json");
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
@@ -269,8 +269,8 @@ void shouldDisposeGlobalRequest() {
     assertTrue(e.getMessage().contains("Response has been disposed"), e.getMessage());
   }
 
-  @Test
-  void shouldSupportGlobalUserAgentOption() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSupportGlobalUserAgentOption(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setUserAgent("My Agent"));
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
     APIResponse response = request.get(server.EMPTY_PAGE);
@@ -279,16 +279,16 @@ void shouldSupportGlobalUserAgentOption() throws ExecutionException, Interrupted
     assertEquals(asList("My Agent"), serverRequest.get().headers.get("user-agent"));
   }
 
-  @Test
-  void shouldSupportGlobalTimeoutOption() {
+  @PlaywrightTest
+  void shouldSupportGlobalTimeoutOption(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setTimeout(100));
     server.setRoute("/empty.html", exchange -> {});
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> request.get(server.EMPTY_PAGE));
     assertTrue(e.getMessage().contains("Timeout 100ms exceeded"), e.getMessage());
   }
 
-  @Test
-  void shouldPropagateExtraHttpHeadersWithRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldPropagateExtraHttpHeadersWithRedirects(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/simple.json");
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setExtraHTTPHeaders(mapOf("My-Secret", "Value")));
@@ -301,8 +301,8 @@ void shouldPropagateExtraHttpHeadersWithRedirects() throws ExecutionException, I
     assertEquals(asList("Value"), req3.get().headers.get("my-secret"));
   }
 
-  @Test
-  void shouldSupportGlobalHttpCredentialsOption() {
+  @PlaywrightTest
+  void shouldSupportGlobalHttpCredentialsOption(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     APIRequestContext request1 = playwright.request().newContext();
     APIResponse response1 = request1.get(server.EMPTY_PAGE);
@@ -315,8 +315,8 @@ void shouldSupportGlobalHttpCredentialsOption() {
     request2.dispose();
   }
 
-  @Test
-  void shouldReturnErrorWithWrongCredentials() {
+  @PlaywrightTest
+  void shouldReturnErrorWithWrongCredentials(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setHttpCredentials("user", "wrong"));
     APIResponse response = request.get(server.EMPTY_PAGE);
@@ -329,25 +329,25 @@ void shouldUseSocksProxy() {
   void shouldPassProxyCredentials() {
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("Error: socket hang up")
-  void shouldSupportGlobalIgnoreHTTPSErrorsOption() {
+  void shouldSupportGlobalIgnoreHTTPSErrorsOption(Playwright playwright, HttpsServer httpsServer) {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setIgnoreHTTPSErrors(true));
     APIResponse response = request.get(httpsServer.EMPTY_PAGE);
     assertEquals(200, response.status());
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("Error: socket hang up")
-  void shouldPropagateIgnoreHTTPSErrorsOnRedirects() {
+  void shouldPropagateIgnoreHTTPSErrorsOnRedirects(Playwright playwright, HttpsServer httpsServer) {
     httpsServer.setRedirect("/redir", "/empty.html");
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(httpsServer.PREFIX + "/redir", RequestOptions.create().setIgnoreHTTPSErrors(true));
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldReturnServerAddressFromResponse() {
+  @PlaywrightTest
+  void shouldReturnServerAddressFromResponse(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(server.EMPTY_PAGE);
     ServerAddr address = response.serverAddr();
@@ -357,23 +357,23 @@ void shouldReturnServerAddressFromResponse() {
     request.dispose();
   }
 
-  @Test
-  void shouldReturnNullSecurityDetailsForHttpResponse() {
+  @PlaywrightTest
+  void shouldReturnNullSecurityDetailsForHttpResponse(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(server.EMPTY_PAGE);
     assertNull(response.securityDetails());
     request.dispose();
   }
 
-  @Test
-  void shouldResolveUrlRelativeToGobalBaseURLOption() {
+  @PlaywrightTest
+  void shouldResolveUrlRelativeToGobalBaseURLOption(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setBaseURL(server.PREFIX));
     APIResponse response = request.get("/empty.html");
     assertEquals(server.EMPTY_PAGE, response.url());
   }
 
-  @Test
-  void shouldSetPlaywrightAsUserAgent() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSetPlaywrightAsUserAgent(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
     request.get(server.EMPTY_PAGE);
@@ -386,8 +386,8 @@ void shouldSetPlaywrightAsUserAgent() throws ExecutionException, InterruptedExce
   void shouldBeAbleToConstructWithContextOptions() {
   }
 
-  @Test
-  void shouldReturnEmptyBody() {
+  @PlaywrightTest
+  void shouldReturnEmptyBody(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     APIResponse response = request.get(server.EMPTY_PAGE);
     byte[] body = response.body();
@@ -398,8 +398,8 @@ void shouldReturnEmptyBody() {
     assertTrue(e.getMessage().contains("Response has been disposed"), e.getMessage());
   }
 
-  @Test
-  void shouldRemoveContentLengthFromReidrectedPostRequests() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldRemoveContentLengthFromReidrectedPostRequests(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/redirect", "/empty.html");
     APIRequestContext request = playwright.request().newContext();
     Future<Server.Request> req1 = server.futureRequest("/redirect");
@@ -420,8 +420,8 @@ void shouldRemoveContentLengthFromReidrectedPostRequests() throws ExecutionExcep
     2021
   );
 
-  @Test
-  void shouldJsonStringifyTypeBodyWhenContentTypeIsApplicationJson() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldJsonStringifyTypeBodyWhenContentTypeIsApplicationJson(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     for (Object value : values) {
       Future<Server.Request> req = server.futureRequest("/empty.html");
@@ -432,8 +432,8 @@ void shouldJsonStringifyTypeBodyWhenContentTypeIsApplicationJson() throws Execut
     request.dispose();
   }
 
-  @Test
-  void shouldNotDoubleStringifyTypeBodyWhenContentTypeIsApplicationJson() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldNotDoubleStringifyTypeBodyWhenContentTypeIsApplicationJson(Playwright playwright, Server server) throws ExecutionException, InterruptedException {
     APIRequestContext request = playwright.request().newContext();
     for (Object value : values) {
       String stringifiedValue = new Gson().toJson(value);
@@ -447,8 +447,8 @@ void shouldNotDoubleStringifyTypeBodyWhenContentTypeIsApplicationJson() throws E
     request.dispose();
   }
 
-  @Test
-  void shouldReturnBodyForFailingRequests() {
+  @PlaywrightTest
+  void shouldReturnBodyForFailingRequests(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     for (String method : new String[] {"head", "put", "trace"}) {
       server.setRoute("/empty.html", exchange -> {
@@ -466,8 +466,8 @@ void shouldReturnBodyForFailingRequests() {
     request.dispose();
   }
 
-  @Test
-  void shouldThrowAnErrorWhenMaxRedirectsIsExceeded() {
+  @PlaywrightTest
+  void shouldThrowAnErrorWhenMaxRedirectsIsExceeded(Playwright playwright, Server server) {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/b/c/redirect3");
     server.setRedirect("/b/c/redirect3", "/b/c/redirect4");
@@ -486,8 +486,8 @@ void shouldThrowAnErrorWhenMaxRedirectsIsExceeded() {
     request.dispose();
   }
 
-  @Test
-  void shouldUseMaxRedirectsFromFetchWhenProvidedOverridingNewContext() {
+  @PlaywrightTest
+  void shouldUseMaxRedirectsFromFetchWhenProvidedOverridingNewContext(Playwright playwright, Server server) {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/b/c/redirect3");
     server.setRedirect("/b/c/redirect3", "/b/c/redirect4");
@@ -502,8 +502,8 @@ void shouldUseMaxRedirectsFromFetchWhenProvidedOverridingNewContext() {
     request.dispose();
   }
 
-  @Test
-  void shouldFollowRedirectsUpToMaxRedirectsLimitSetInNewContext() {
+  @PlaywrightTest
+  void shouldFollowRedirectsUpToMaxRedirectsLimitSetInNewContext(Playwright playwright, Server server) {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/b/c/redirect3");
     server.setRedirect("/b/c/redirect3", "/b/c/redirect4");
@@ -527,8 +527,8 @@ void shouldFollowRedirectsUpToMaxRedirectsLimitSetInNewContext() {
     }
   }
 
-  @Test
-  void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0InNewContext() {
+  @PlaywrightTest
+  void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0InNewContext(Playwright playwright, Server server) {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/simple.json");
 
@@ -542,8 +542,8 @@ void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0InNewContext() {
     request.dispose();
   }
 
-  @Test
-  void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0() {
+  @PlaywrightTest
+  void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0(Playwright playwright, Server server) {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/simple.json");
 
@@ -557,8 +557,8 @@ void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0() {
     request.dispose();
   }
 
-  @Test
-  void shouldThrowAnErrorWhenMaxRedirectsIsLessThan0() {
+  @PlaywrightTest
+  void shouldThrowAnErrorWhenMaxRedirectsIsLessThan0(Playwright playwright, Server server) {
     server.setRedirect("/a/redirect1", "/b/c/redirect2");
     server.setRedirect("/b/c/redirect2", "/simple.json");
 
@@ -572,8 +572,8 @@ void shouldThrowAnErrorWhenMaxRedirectsIsLessThan0() {
     request.dispose();
   }
 
-  @Test
-  void shouldNotModifyRequestMethodInOptions() {
+  @PlaywrightTest
+  void shouldNotModifyRequestMethodInOptions(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().set("Content-type", "text/plain");
@@ -602,8 +602,8 @@ void shouldNotModifyRequestMethodInOptions() {
     request.dispose();
   }
 
-  @Test
-  void shouldSupportGlobalHttpCredentialsOptionAndMatchingOrigin() {
+  @PlaywrightTest
+  void shouldSupportGlobalHttpCredentialsOptionAndMatchingOrigin(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     APIRequestContext request1 = playwright.request().newContext();
     APIResponse response1 = request1.get(server.EMPTY_PAGE);
@@ -618,8 +618,8 @@ void shouldSupportGlobalHttpCredentialsOptionAndMatchingOrigin() {
     request2.dispose();
   }
 
-  @Test
-  void shouldSupportGlobalHttpCredentialsOptionAndMatchingOriginCaseInsensitive() {
+  @PlaywrightTest
+  void shouldSupportGlobalHttpCredentialsOptionAndMatchingOriginCaseInsensitive(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     APIRequestContext request1 = playwright.request().newContext();
     APIResponse response1 = request1.get(server.EMPTY_PAGE);
@@ -634,8 +634,8 @@ void shouldSupportGlobalHttpCredentialsOptionAndMatchingOriginCaseInsensitive()
     request2.dispose();
   }
 
-  @Test
-  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme() {
+  @PlaywrightTest
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginScheme(server));
@@ -644,8 +644,8 @@ void shouldReturnErrorWithCorrectCredentialsAndWrongOriginScheme() {
     assertEquals(401, response.status());
   }
 
-  @Test
-  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname() {
+  @PlaywrightTest
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginHostname(server));
@@ -654,8 +654,8 @@ void shouldReturnErrorWithCorrectCredentialsAndWrongOriginHostname() {
     assertEquals(401, response.status());
   }
 
-  @Test
-  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort() {
+  @PlaywrightTest
+  void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user", "pass");
     final HttpCredentials httpCredentials = new HttpCredentials("user", "pass");
     httpCredentials.setOrigin(Utils.generateDifferentOriginPort(server));
@@ -664,8 +664,8 @@ void shouldReturnErrorWithCorrectCredentialsAndWrongOriginPort() {
     assertEquals(401, response.status());
   }
 
-  @Test
-  void shouldSupportHTTPCredentialsSendImmediately() throws InterruptedException, ExecutionException {
+  @PlaywrightTest
+  void shouldSupportHTTPCredentialsSendImmediately(Playwright playwright, Server server) throws InterruptedException, ExecutionException {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions()
       .setHttpCredentials(new HttpCredentials("user", "pass")
         .setOrigin(server.PREFIX.toUpperCase())
@@ -688,16 +688,16 @@ void shouldSupportHTTPCredentialsSendImmediately() throws InterruptedException,
     request.dispose();
   }
 
-  @Test
-  void shouldSupportDisposeReason() {
+  @PlaywrightTest
+  void shouldSupportDisposeReason(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext();
     request.dispose(new APIRequestContext.DisposeOptions().setReason("My reason"));
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> request.get(server.EMPTY_PAGE));
     assertTrue(e.getMessage().contains("My reason"), e.getMessage());
   }
 
-  @Test
-  public void shouldRetryECONNRESET() {
+  @PlaywrightTest
+  public void shouldRetryECONNRESET(Playwright playwright, Server server) {
     int[] requestCount = {0};
     server.setRoute("/test", exchange -> {
       if (requestCount[0]++ < 3) {
@@ -721,8 +721,8 @@ public void shouldRetryECONNRESET() {
     requestContext.dispose();
   }
 
-  @Test
-  public void shouldThrowWhenFailOnStatusCodeIsSetToTrue() {
+  @PlaywrightTest
+  public void shouldThrowWhenFailOnStatusCodeIsSetToTrue(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setFailOnStatusCode(true));
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().set("Content-Length", "10");
@@ -738,8 +738,8 @@ public void shouldThrowWhenFailOnStatusCodeIsSetToTrue() {
     assertTrue(error.getMessage().contains("404 Not Found"));
   }
 
-  @Test
-  public void shouldNotThrowWhenFailOnStatusCodeIsSetToFalse() {
+  @PlaywrightTest
+  public void shouldNotThrowWhenFailOnStatusCodeIsSetToFalse(Playwright playwright, Server server) {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions().setFailOnStatusCode(false));
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().set("Content-Length", "10");
@@ -753,8 +753,8 @@ public void shouldNotThrowWhenFailOnStatusCodeIsSetToFalse() {
     assertEquals(404, response.status());
   }
 
-  @Test
-  void shouldSupportMultipleHttpCredentials() {
+  @PlaywrightTest
+  void shouldSupportMultipleHttpCredentials(Playwright playwright, Server server) {
     server.setAuth("/empty.html", "user1", "pass1");
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions()
       .setHttpCredentials(asList(
@@ -768,8 +768,8 @@ void shouldSupportMultipleHttpCredentials() {
     request.dispose();
   }
 
-  @Test
-  void shouldSupportHTTPCredentialsSendWithMultipleHttpCredentials() throws InterruptedException, ExecutionException {
+  @PlaywrightTest
+  void shouldSupportHTTPCredentialsSendWithMultipleHttpCredentials(Playwright playwright, Server server) throws InterruptedException, ExecutionException {
     APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions()
       .setHttpCredentials(asList(
         new HttpCredentials("user1", "pass1").setOrigin(server.PREFIX).setSend(HttpCredentialsSend.ALWAYS),
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestHar.java b/playwright/src/test/java/com/microsoft/playwright/TestHar.java
index 825b1102d..e891f7cc3 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestHar.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestHar.java
@@ -17,10 +17,10 @@
 package com.microsoft.playwright;
 
 import com.google.gson.*;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HarContentPolicy;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.*;
@@ -30,28 +30,27 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestHar extends TestBase {
-  private PageWithHar pageWithHar;
-
+public class TestHar {
   private static JsonObject parseHar(Path harFile) throws IOException {
     try (FileReader json = new FileReader(harFile.toFile())) {
       return new Gson().fromJson(json, JsonObject.class).getAsJsonObject("log");
     }
   }
 
-  private class PageWithHar {
+  private static class PageWithHar implements AutoCloseable {
     final Path harFile;
     final BrowserContext context;
     final Page page;
 
-    PageWithHar() throws IOException {
-      this(new Browser.NewContextOptions(), null);
+    PageWithHar(Browser browser) throws IOException {
+      this(browser, new Browser.NewContextOptions(), null);
     }
 
-    PageWithHar(Browser.NewContextOptions options, Path harFilePath) throws IOException {
+    PageWithHar(Browser browser, Browser.NewContextOptions options, Path harFilePath) throws IOException {
       harFile = harFilePath == null ? Files.createTempFile("test-", ".har") : harFilePath;
       context = browser.newContext(options
         .setRecordHarPath(harFile).setIgnoreHTTPSErrors(true));
@@ -68,44 +67,40 @@ Map<String, byte[]> parseZip() throws IOException {
       return Utils.parseZip(harFile);
     }
 
-    void dispose() throws IOException {
+    @Override
+    public void close() throws IOException {
       context.close();
       Files.deleteIfExists(harFile);
     }
   }
 
-  @BeforeEach
-  void createPageWithHar() throws IOException {
-    pageWithHar = new PageWithHar();
-  }
-
-  @AfterEach
-  void deletePageWithHar() throws IOException {
-    pageWithHar.dispose();
+  @Fixture
+  PageWithHar pageWithHar(Browser browser) throws IOException {
+    return new PageWithHar(browser);
   }
 
   void shouldThrowWithoutPath() {
     // not applicable in java
   }
 
-  @Test
-  void shouldHaveVersionAndCreator() throws IOException {
+  @PlaywrightTest
+  void shouldHaveVersionAndCreator(Server server, PageWithHar pageWithHar) throws IOException {
     pageWithHar.page.navigate(server.EMPTY_PAGE);
     JsonObject log = pageWithHar.log();
     assertEquals("1.2", log.get("version").getAsString());
     assertEquals("Playwright", log.getAsJsonObject("creator").get("name").getAsString());
   }
 
-  @Test
-  void shouldHaveBrowser() throws IOException {
+  @PlaywrightTest
+  void shouldHaveBrowser(Browser browser, BrowserType browserType, Server server, PageWithHar pageWithHar) throws IOException {
     pageWithHar.page.navigate(server.EMPTY_PAGE);
     JsonObject log = pageWithHar.log();
     assertEquals(browserType.name(), log.getAsJsonObject("browser").get("name").getAsString().toLowerCase());
     assertEquals(browser.version(), log.getAsJsonObject("browser").get("version").getAsString());
   }
 
-  @Test
-  void shouldHavePages() throws IOException {
+  @PlaywrightTest
+  void shouldHavePages(PageWithHar pageWithHar) throws IOException {
     pageWithHar.page.navigate("data:text/html,<title>Hello</title>");
     // For data: load comes before domcontentloaded...
     pageWithHar.page.waitForLoadState(DOMCONTENTLOADED);
@@ -120,8 +115,8 @@ void shouldHavePages() throws IOException {
     assertTrue(pageEntry.getAsJsonObject("pageTimings").get("onLoad").getAsDouble() > 0);
   }
 
-  @Test
-  void shouldHavePagesInPersistentContext() throws IOException {
+  @PlaywrightTest
+  void shouldHavePagesInPersistentContext(BrowserType browserType, PageWithHar pageWithHar) throws IOException {
     Path harPath = pageWithHar.harFile;
     Path userDataDir = Files.createTempDirectory("user-data-dir-");
     BrowserContext context = browserType.launchPersistentContext(userDataDir,
@@ -143,8 +138,8 @@ void shouldHavePagesInPersistentContext() throws IOException {
     assertEquals("Hello", pageEntry.get("title").getAsString());
   }
 
-  @Test
-  void shouldIncludeRequest() throws IOException {
+  @PlaywrightTest
+  void shouldIncludeRequest(Server server, PageWithHar pageWithHar) throws IOException {
     pageWithHar.page.navigate(server.EMPTY_PAGE);
     JsonObject log = pageWithHar.log();
     assertEquals(1, log.getAsJsonArray("entries").size());
@@ -165,8 +160,8 @@ void shouldIncludeRequest() throws IOException {
     assertTrue(foundUserAgentHeader);
   }
 
-  @Test
-  void shouldIncludeResponse() throws IOException {
+  @PlaywrightTest
+  void shouldIncludeResponse(Server server, PageWithHar pageWithHar) throws IOException {
     pageWithHar.page.navigate(server.EMPTY_PAGE);
     JsonObject log = pageWithHar.log();
     JsonObject entry = log.getAsJsonArray("entries").get(0).getAsJsonObject();
@@ -186,8 +181,8 @@ void shouldIncludeResponse() throws IOException {
     assertTrue(foundUserContentType);
   }
 
-  @Test
-  void shouldFilterByGlob(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldFilterByGlob(Browser browser, Server server, BrowserName browserName, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("test.har");
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setBaseURL(server.PREFIX)
@@ -200,7 +195,7 @@ void shouldFilterByGlob(@TempDir Path tmpDir) throws IOException {
     JsonObject log = parseHar(harPath);
     JsonArray entries = log.getAsJsonArray("entries");
     // There are 2 entries for the same .css request in firefox.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals(2, entries.size());
     } else {
       assertEquals(1, entries.size());
@@ -208,8 +203,8 @@ void shouldFilterByGlob(@TempDir Path tmpDir) throws IOException {
     assertTrue(entries.get(0).getAsJsonObject().getAsJsonObject("request").get("url").getAsString().endsWith("one-style.css"));
   }
 
-  @Test
-  void shouldFilterByRegexp(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldFilterByRegexp(Browser browser, Server server, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("test.har");
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setBaseURL(server.PREFIX)
@@ -225,15 +220,15 @@ void shouldFilterByRegexp(@TempDir Path tmpDir) throws IOException {
     assertTrue(entries.get(0).getAsJsonObject().getAsJsonObject("request").get("url").getAsString().endsWith("har.html"));
   }
 
-  @Test
-  void shouldOmitContent(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldOmitContent(Server server, Browser browser, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("test.har");
-    PageWithHar pageWithHar = new PageWithHar(new Browser.NewContextOptions()
+    PageWithHar pageWithHar = new PageWithHar(browser, new Browser.NewContextOptions()
       .setRecordHarContent(HarContentPolicy.OMIT), harPath);
     pageWithHar.page.navigate(server.PREFIX + "/har.html");
     pageWithHar.page.evaluate("() => fetch('/pptr.png').then(r => r.arrayBuffer())");
     JsonObject log = pageWithHar.log();
-    pageWithHar.dispose();
+    pageWithHar.close();
     JsonArray entries = log.getAsJsonArray("entries");
     assertFalse(entries.get(0).getAsJsonObject()
       .getAsJsonObject("response")
@@ -245,15 +240,15 @@ void shouldOmitContent(@TempDir Path tmpDir) throws IOException {
       .has("_file"));
   }
 
-  @Test
-  void shouldOmitContentLegacy(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldOmitContentLegacy(Server server, Browser browser, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("test.har");
-    PageWithHar pageWithHar = new PageWithHar(new Browser.NewContextOptions()
+    PageWithHar pageWithHar = new PageWithHar(browser, new Browser.NewContextOptions()
       .setRecordHarOmitContent(true), harPath);
     pageWithHar.page.navigate(server.PREFIX + "/har.html");
     pageWithHar.page.evaluate("() => fetch('/pptr.png').then(r => r.arrayBuffer())");
     JsonObject log = pageWithHar.log();
-    pageWithHar.dispose();
+    pageWithHar.close();
     JsonArray entries = log.getAsJsonArray("entries");
     assertFalse(entries.get(0).getAsJsonObject()
       .getAsJsonObject("response")
@@ -265,16 +260,16 @@ void shouldOmitContentLegacy(@TempDir Path tmpDir) throws IOException {
       .has("_file"));
   }
 
-  @Test
-  void shouldAttachContent(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldAttachContent(Server server, Browser browser, @TempDir Path tmpDir) throws IOException {
     Path harPath = tmpDir.resolve("test.har.zip");
-    PageWithHar pageWithHar = new PageWithHar(new Browser.NewContextOptions()
+    PageWithHar pageWithHar = new PageWithHar(browser, new Browser.NewContextOptions()
       .setRecordHarContent(HarContentPolicy.ATTACH), harPath);
     pageWithHar.page.navigate(server.PREFIX + "/har.html");
     pageWithHar.page.evaluate("() => fetch('/pptr.png').then(r => r.arrayBuffer())");
     Map<String, byte[]> zip = pageWithHar.parseZip();
     JsonObject log = new Gson().fromJson(new InputStreamReader(new ByteArrayInputStream(zip.get("har.har"))), JsonObject.class).getAsJsonObject("log");
-    pageWithHar.dispose();
+    pageWithHar.close();
 
     JsonArray entries = log.getAsJsonArray("entries");
     {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestJavaSourceLocationInConstructor.java b/playwright/src/test/java/com/microsoft/playwright/TestJavaSourceLocationInConstructor.java
index 223939866..7be989e28 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestJavaSourceLocationInConstructor.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestJavaSourceLocationInConstructor.java
@@ -16,7 +16,9 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import com.microsoft.playwright.fixtures.Scope;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
@@ -31,16 +33,16 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestJavaSourceLocationInConstructor extends TestBase {
+public class TestJavaSourceLocationInConstructor {
   private static final String SRC_DIRS = System.getenv("PLAYWRIGHT_JAVA_SRC") == null ? "src/test/java" : System.getenv("PLAYWRIGHT_JAVA_SRC");
 
-  @Override
-  Playwright.CreateOptions playwrightOptions() {
+  @Fixture(scope = Scope.WORKER)
+  static Playwright.CreateOptions createOptions() {
     return new Playwright.CreateOptions().setEnv(mapOf("PLAYWRIGHT_JAVA_SRC", SRC_DIRS));
   }
 
-  @Test
-  void shouldSupportSourcesLocationPassedToPlaywrightCreate(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldSupportSourcesLocationPassedToPlaywrightCreate(Page page, BrowserContext context, Server server, @TempDir Path tmpDir) throws IOException {
     context.tracing().start(new Tracing.StartOptions().setSources(true));
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<button>Click</button>");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAnyFrame.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAnyFrame.java
index 59d5b0114..b6aee4e9b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAnyFrame.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAnyFrame.java
@@ -17,15 +17,15 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.LocatorAssertions;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
 import com.microsoft.playwright.options.WaitForSelectorState;
-import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestLocatorAnyFrame extends TestBase {
+public class TestLocatorAnyFrame {
   private static void routePage(Page page, String url, String body) {
     page.route("**/" + url, route -> route.fulfill(new Route.FulfillOptions().setBody(body).setContentType("text/html")));
   }
@@ -41,8 +41,8 @@ private static void waitForAllFrames(Page page, int frameCount, String selector)
     }
   }
 
-  @Test
-  void shouldClickAButtonInsideAnIframe() {
+  @PlaywrightTest
+  void shouldClickAButtonInsideAnIframe(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<button onclick=\"window.__clicked = true\">Click me</button>");
     page.navigate(server.EMPTY_PAGE);
@@ -50,8 +50,8 @@ void shouldClickAButtonInsideAnIframe() {
     assertEquals(true, page.frames().get(1).evaluate("() => window.__clicked"));
   }
 
-  @Test
-  void shouldClickAButtonInTheMainFrame() {
+  @PlaywrightTest
+  void shouldClickAButtonInTheMainFrame(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe><button onclick=\"window.__clicked = true\">Click me</button>");
     routePage(page, "a.html", "<div>No buttons here</div>");
     page.navigate(server.EMPTY_PAGE);
@@ -59,8 +59,8 @@ void shouldClickAButtonInTheMainFrame() {
     assertEquals(true, page.evaluate("() => window.__clicked"));
   }
 
-  @Test
-  void shouldFailClickWhenElementsMatchInMultipleFrames() {
+  @PlaywrightTest
+  void shouldFailClickWhenElementsMatchInMultipleFrames(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe><iframe src=\"b.html\"></iframe>");
     routePage(page, "a.html", "<button>one</button>");
     routePage(page, "b.html", "<button>two</button>");
@@ -71,8 +71,8 @@ void shouldFailClickWhenElementsMatchInMultipleFrames() {
     assertTrue(e.getMessage().contains("frameLocator() matched elements in multiple frames"), e.getMessage());
   }
 
-  @Test
-  void shouldFailClickUponStrictModeViolationInsideASingleFrame() {
+  @PlaywrightTest
+  void shouldFailClickUponStrictModeViolationInsideASingleFrame(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<button>one</button><button>two</button>");
     page.navigate(server.EMPTY_PAGE);
@@ -82,8 +82,8 @@ void shouldFailClickUponStrictModeViolationInsideASingleFrame() {
     assertTrue(e.getMessage().contains("strict mode violation"), e.getMessage());
   }
 
-  @Test
-  void shouldTimeOutOnClickWhenThereAreNoMatches() {
+  @PlaywrightTest
+  void shouldTimeOutOnClickWhenThereAreNoMatches(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<div>Nothing here</div>");
     page.navigate(server.EMPTY_PAGE);
@@ -92,8 +92,8 @@ void shouldTimeOutOnClickWhenThereAreNoMatches() {
     assertTrue(e.getMessage().contains("Timeout 1000ms exceeded"), e.getMessage());
   }
 
-  @Test
-  void shouldCountElementsInASingleFrame() {
+  @PlaywrightTest
+  void shouldCountElementsInASingleFrame(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<div>1</div><div>2</div><div>3</div>");
     page.navigate(server.EMPTY_PAGE);
@@ -102,8 +102,8 @@ void shouldCountElementsInASingleFrame() {
     assertEquals(0, page.frameLocator().locator("button").count());
   }
 
-  @Test
-  void shouldFailCountWhenElementsMatchInMultipleFrames() {
+  @PlaywrightTest
+  void shouldFailCountWhenElementsMatchInMultipleFrames(Page page, Server server) {
     routePage(page, "empty.html", "<div>main</div><iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<div>child</div>");
     page.navigate(server.EMPTY_PAGE);
@@ -112,8 +112,8 @@ void shouldFailCountWhenElementsMatchInMultipleFrames() {
     assertTrue(e.getMessage().contains("frameLocator() matched elements in multiple frames"), e.getMessage());
   }
 
-  @Test
-  void shouldSupportHasCount() {
+  @PlaywrightTest
+  void shouldSupportHasCount(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<span>one</span><span>two</span>");
     page.navigate(server.EMPTY_PAGE);
@@ -121,8 +121,8 @@ void shouldSupportHasCount() {
     assertThat(page.frameLocator().locator("button")).hasCount(0);
   }
 
-  @Test
-  void shouldWaitForAFrameToAppearWithHasCount() {
+  @PlaywrightTest
+  void shouldWaitForAFrameToAppearWithHasCount(Page page, Server server) {
     routePage(page, "empty.html", "<div>No frames yet</div>");
     routePage(page, "a.html", "<span>one</span><span>two</span>");
     page.navigate(server.EMPTY_PAGE);
@@ -136,8 +136,8 @@ void shouldWaitForAFrameToAppearWithHasCount() {
     assertThat(page.frameLocator().locator("span")).hasCount(2);
   }
 
-  @Test
-  void shouldFailHasCountWhenElementsMatchInMultipleFrames() {
+  @PlaywrightTest
+  void shouldFailHasCountWhenElementsMatchInMultipleFrames(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe><iframe src=\"b.html\"></iframe>");
     routePage(page, "a.html", "<span>one</span>");
     routePage(page, "b.html", "<span>two</span>");
@@ -148,24 +148,24 @@ void shouldFailHasCountWhenElementsMatchInMultipleFrames() {
     assertTrue(e.getMessage().contains("frameLocator() matched elements in multiple frames"), e.getMessage());
   }
 
-  @Test
-  void shouldSupportHasText() {
+  @PlaywrightTest
+  void shouldSupportHasText(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<div>Hello iframe</div>");
     page.navigate(server.EMPTY_PAGE);
     assertThat(page.frameLocator().locator("div")).hasText("Hello iframe");
   }
 
-  @Test
-  void shouldSupportEvaluate() {
+  @PlaywrightTest
+  void shouldSupportEvaluate(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<button>one</button>");
     page.navigate(server.EMPTY_PAGE);
     assertEquals("one", page.frameLocator().locator("button").evaluate("e => e.textContent"));
   }
 
-  @Test
-  void shouldSupportFirstLastNth() {
+  @PlaywrightTest
+  void shouldSupportFirstLastNth(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<span>one</span><span>two</span><span>three</span>");
     page.navigate(server.EMPTY_PAGE);
@@ -174,16 +174,16 @@ void shouldSupportFirstLastNth() {
     assertThat(page.frameLocator().locator("span").nth(1)).hasText("two");
   }
 
-  @Test
-  void shouldNotAllowNthFrameOnAnyFrameLocator() {
+  @PlaywrightTest
+  void shouldNotAllowNthFrameOnAnyFrameLocator(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.frameLocator().first());
     assertTrue(e.getMessage().contains("Selecting the nth frame is not allowed on frameLocator()"), e.getMessage());
     assertThrows(PlaywrightException.class, () -> page.frameLocator().last());
     assertThrows(PlaywrightException.class, () -> page.frameLocator().nth(1));
   }
 
-  @Test
-  void shouldSupportTwoFrameLocators() {
+  @PlaywrightTest
+  void shouldSupportTwoFrameLocators(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<iframe id=\"x\" src=\"b.html\"></iframe>");
     routePage(page, "b.html", "<iframe id=\"y\" src=\"c.html\"></iframe><button>decoy</button>");
@@ -192,8 +192,8 @@ void shouldSupportTwoFrameLocators() {
     assertThat(page.frameLocator().frameLocator("#x").frameLocator("#y").locator("button")).hasText("bottom");
   }
 
-  @Test
-  void shouldSupportLocatorBeforeFrameLocator() {
+  @PlaywrightTest
+  void shouldSupportLocatorBeforeFrameLocator(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<section><iframe src=\"b.html\"></iframe></section><iframe src=\"c.html\"></iframe>");
     routePage(page, "b.html", "<button>in-section</button>");
@@ -202,8 +202,8 @@ void shouldSupportLocatorBeforeFrameLocator() {
     assertThat(page.frameLocator().locator("section").frameLocator("iframe").locator("button")).hasText("in-section");
   }
 
-  @Test
-  void shouldSupportOwnerOfAFrameLocator() {
+  @PlaywrightTest
+  void shouldSupportOwnerOfAFrameLocator(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<iframe id=\"target\" src=\"b.html\"></iframe>");
     routePage(page, "b.html", "<button>inside</button>");
@@ -211,8 +211,8 @@ void shouldSupportOwnerOfAFrameLocator() {
     assertEquals("target", page.frameLocator().frameLocator("#target").owner().getAttribute("id"));
   }
 
-  @Test
-  void shouldSupportContentFrameAfterAnyFrameLocator() {
+  @PlaywrightTest
+  void shouldSupportContentFrameAfterAnyFrameLocator(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<iframe id=\"my-frame\" src=\"b.html\"></iframe>");
     routePage(page, "b.html", "<button>inside</button>");
@@ -220,8 +220,8 @@ void shouldSupportContentFrameAfterAnyFrameLocator() {
     assertThat(page.frameLocator().locator("#my-frame").contentFrame().getByRole(AriaRole.BUTTON)).hasText("inside");
   }
 
-  @Test
-  void shouldWorkOnFrame() {
+  @PlaywrightTest
+  void shouldWorkOnFrame(Page page, Server server) {
     routePage(page, "empty.html", "<iframe src=\"a.html\"></iframe>");
     routePage(page, "a.html", "<iframe src=\"b.html\"></iframe>");
     routePage(page, "b.html", "<button>deep</button>");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java
index 27fa7dc2f..c0d7db266 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java
@@ -17,22 +17,21 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.LocatorAssertions;
-import com.microsoft.playwright.assertions.PlaywrightAssertions;
 import com.microsoft.playwright.assertions.LocatorAssertions.ContainsClassOptions;
-
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.assertions.PlaywrightAssertions;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.opentest4j.AssertionFailedError;
 
-import static java.util.Arrays.asList;
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.Utils.mapOf;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestLocatorAssertions extends TestBase {
-  @Test
-  void containsTextWRegexPass() {
+public class TestLocatorAssertions {
+  @PlaywrightTest
+  void containsTextWRegexPass(Page page) {
     page.setContent("<div id=node>Text   content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).containsText(Pattern.compile("ex"));
@@ -40,29 +39,29 @@ void containsTextWRegexPass() {
     assertThat(locator).containsText(Pattern.compile("ext   cont"));
   }
 
-  @Test
-  void containsTextWRegexCaseInsensitivePass() {
+  @PlaywrightTest
+  void containsTextWRegexCaseInsensitivePass(Page page) {
     page.setContent("<div id=node>Text   content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).containsText(Pattern.compile("text", Pattern.CASE_INSENSITIVE));
   }
 
-  @Test
-  void containsTextWRegexMultilinePass() {
+  @PlaywrightTest
+  void containsTextWRegexMultilinePass(Page page) {
     page.setContent("<div id=node>Text \nContent</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).containsText(Pattern.compile("^Content", Pattern.MULTILINE));
   }
 
-  @Test
-  void containsTextWRegexDotAllPass() {
+  @PlaywrightTest
+  void containsTextWRegexDotAllPass(Page page) {
     page.setContent("<div id=node>foo\nbar</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).containsText(Pattern.compile("foo.bar", Pattern.DOTALL));
   }
 
-  @Test
-  void containsTextWRegexFail() {
+  @PlaywrightTest
+  void containsTextWRegexFail(Page page) {
     page.setContent("<div id=node>Text   content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -73,8 +72,8 @@ void containsTextWRegexFail() {
     assertTrue(e.getMessage().contains("Locator expected to contain regex"), e.getMessage());
   }
 
-  @Test
-  void containsTextWTextPass() {
+  @PlaywrightTest
+  void containsTextWTextPass(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).containsText("Text");
@@ -86,8 +85,8 @@ void containsTextWTextPass() {
     assertThat(locator).not().containsText("TEXT", new LocatorAssertions.ContainsTextOptions().setIgnoreCase(false));
   }
 
-  @Test
-  void containsTextWTextArrayPass() {
+  @PlaywrightTest
+  void containsTextWTextArrayPass(Page page) {
     page.setContent("<div>Text \n1</div><div>Text2</div><div>Text3</div>");
     Locator locator = page.locator("div");
     assertThat(locator).containsText(new String[] {"ext     1", "ext3"});
@@ -95,8 +94,8 @@ void containsTextWTextArrayPass() {
     assertThat(locator).containsText(new String[] {"EXT 1", "eXt3"}, new LocatorAssertions.ContainsTextOptions().setIgnoreCase(true));
   }
 
-  @Test
-  void hasTextWRegexPass() {
+  @PlaywrightTest
+  void hasTextWRegexPass(Page page) {
     page.setContent("<div id=node>Text   content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasText(Pattern.compile("Te.t"));
@@ -108,8 +107,8 @@ void hasTextWRegexPass() {
     assertThat(locator).not().hasText(Pattern.compile("text   content", Pattern.CASE_INSENSITIVE), new LocatorAssertions.HasTextOptions().setIgnoreCase(false));
   }
 
-  @Test
-  void hasTextWRegexFail() {
+  @PlaywrightTest
+  void hasTextWRegexFail(Page page) {
     page.setContent("<div id=node>Text   content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -120,8 +119,8 @@ void hasTextWRegexFail() {
     assertTrue(e.getMessage().contains("Locator expected to have text matching regex"), e.getMessage());
   }
 
-  @Test
-  void hasTextWTextPass() {
+  @PlaywrightTest
+  void hasTextWTextPass(Page page) {
     page.setContent("<div id=node><span></span>Text \ncontent&nbsp;    </div>");
     Locator locator = page.locator("#node");
     // Should normalize whitespace.
@@ -132,8 +131,8 @@ void hasTextWTextPass() {
     assertThat(locator).not().hasText("TEXT", new LocatorAssertions.HasTextOptions().setIgnoreCase(false));
   }
 
-  @Test
-  void hasTextWTextFail() {
+  @PlaywrightTest
+  void hasTextWTextFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     // Should normalize whitespace.
@@ -145,15 +144,15 @@ void hasTextWTextFail() {
     assertTrue(e.getMessage().contains("Locator expected to have text"), e.getMessage());
   }
 
-  @Test
-  void hasTextWTextInnerTextPass() {
+  @PlaywrightTest
+  void hasTextWTextInnerTextPass(Page page) {
     page.setContent("<div id=node>Text <span hidden>garbage</span> content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasText("Text content", new LocatorAssertions.HasTextOptions().setUseInnerText(true));
   }
 
-  @Test
-  void hasTextWTextArrayPass() {
+  @PlaywrightTest
+  void hasTextWTextArrayPass(Page page) {
     page.setContent("<div>Text    \n1</div><div>Text   2a</div>");
     Locator locator = page.locator("div");
     // Should normalize whitespace.
@@ -162,32 +161,32 @@ void hasTextWTextArrayPass() {
     assertThat(locator).hasText(new String[] {"tEXT 1", "TExt 2A"}, new LocatorAssertions.HasTextOptions().setIgnoreCase(true));
   }
 
-  @Test
-  void hasTextWTextArrayPassEmpty() {
+  @PlaywrightTest
+  void hasTextWTextArrayPassEmpty(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("p");
     // Should normalize whitespace.
     assertThat(locator).hasText(new String[] {});
   }
 
-  @Test
-  void hasTextWTextArrayPassNotEmpty() {
+  @PlaywrightTest
+  void hasTextWTextArrayPassNotEmpty(Page page) {
     page.setContent("<div><p>Test</p></div>");
     Locator locator = page.locator("div");
     // Should normalize whitespace.
     assertThat(locator).not().hasText(new String[] {});
   }
 
-  @Test
-  void hasTextWTextArrayPassOnEmpty() {
+  @PlaywrightTest
+  void hasTextWTextArrayPassOnEmpty(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("p");
     // Should normalize whitespace.
     assertThat(locator).not().hasText(new String[] {"Test"});
   }
 
-  @Test
-  void hasTextWTextArrayFailOnNotEmpty() {
+  @PlaywrightTest
+  void hasTextWTextArrayFailOnNotEmpty(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("p");
     // Should normalize whitespace.
@@ -199,8 +198,8 @@ void hasTextWTextArrayFailOnNotEmpty() {
     assertTrue(e.getMessage().contains("Locator expected not to have text"), e.getMessage());
   }
 
-  @Test
-  void hasTextWTextArrayPassLazyPass() {
+  @PlaywrightTest
+  void hasTextWTextArrayPassLazyPass(Page page) {
     page.setContent("<div id=div></div>");
     Locator locator = page.locator("p");
     page.evaluate("setTimeout(() => {\n" +
@@ -210,8 +209,8 @@ void hasTextWTextArrayPassLazyPass() {
     assertThat(locator).hasText(new String[] {"Text  1", "Text   2"}, new LocatorAssertions.HasTextOptions().setTimeout(1000));
   }
 
-  @Test
-  void hasTextWTextArrayFail() {
+  @PlaywrightTest
+  void hasTextWTextArrayFail(Page page) {
     page.setContent("<div>Text 1</div><div>Text 3</div>");
     Locator locator = page.locator("div");
     page.evaluate("setTimeout(() => {\n" +
@@ -227,16 +226,16 @@ void hasTextWTextArrayFail() {
     assertTrue(e.getMessage().contains("Received: [Text 1, Text 3]"), e.getMessage());
   }
 
-  @Test
-  void hasTextWRegExArrayPass() {
+  @PlaywrightTest
+  void hasTextWRegExArrayPass(Page page) {
     page.setContent("<div>Text    \n1</div><div>Text   2a</div>");
     Locator locator = page.locator("div");
     // Should normalize whitespace.
     assertThat(locator).hasText(new Pattern[] {Pattern.compile( "Text    \n1"), Pattern.compile("Text   \\d+a")});
   }
 
-  @Test
-  void hasTextWRegExArrayFail() {
+  @PlaywrightTest
+  void hasTextWRegExArrayFail(Page page) {
     page.setContent("<div>Text 1</div><div>Text 3</div>");
     Locator locator = page.locator("div");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -248,23 +247,23 @@ void hasTextWRegExArrayFail() {
     assertTrue(e.getMessage().contains("Locator expected to have text"), e.getMessage());
   }
 
-  @Test
-  void hasAttributeTextIgnoreCase() {
+  @PlaywrightTest
+  void hasAttributeTextIgnoreCase(Page page) {
     page.setContent("<div id=NoDe>Text content</div>");
     Locator locator = page.locator("#NoDe");
     assertThat(locator).hasAttribute("id", "node", new LocatorAssertions.HasAttributeOptions().setIgnoreCase(true));
     assertThat(locator).not().hasAttribute("id", "node");
   }
 
-  @Test
-  void hasAttributeTextPass() {
+  @PlaywrightTest
+  void hasAttributeTextPass(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasAttribute("id", "node");
   }
 
-  @Test
-  void hasAttributeTextFail() {
+  @PlaywrightTest
+  void hasAttributeTextFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -275,15 +274,15 @@ void hasAttributeTextFail() {
     assertTrue(e.getMessage().contains("Locator expected to have attribute 'id'\nExpected: foo\nReceived: node"), e.getMessage());
   }
 
-  @Test
-  void hasAttributeRegExpPass() {
+  @PlaywrightTest
+  void hasAttributeRegExpPass(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasAttribute("id", Pattern.compile("n..e"));
   }
 
-  @Test
-  void hasAttributeRegExpFail() {
+  @PlaywrightTest
+  void hasAttributeRegExpFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -294,15 +293,15 @@ void hasAttributeRegExpFail() {
     assertTrue(e.getMessage().contains("Locator expected to have attribute 'id' matching regex\nExpected: .Nod..\nReceived: node"), e.getMessage());
   }
 
-  @Test
-  void hasClassTextPass() {
+  @PlaywrightTest
+  void hasClassTextPass(Page page) {
     page.setContent("<div class=\"foo bar baz\"></div>");
     Locator locator = page.locator("div");
     assertThat(locator).hasClass("foo bar baz");
   }
 
-  @Test
-  void hasClassTextFail() {
+  @PlaywrightTest
+  void hasClassTextFail(Page page) {
     page.setContent("<div class=\"bar baz\"></div>");
     Locator locator = page.locator("div");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -313,15 +312,15 @@ void hasClassTextFail() {
     assertTrue(e.getMessage().contains("Locator expected to have class"), e.getMessage());
   }
 
-  @Test
-  void hasClassRegExpPass() {
+  @PlaywrightTest
+  void hasClassRegExpPass(Page page) {
     page.setContent("<div class=\"foo bar baz\"></div>");
     Locator locator = page.locator("div");
     assertThat(locator).hasClass(Pattern.compile("foo.* baz"));
   }
 
-  @Test
-  void hasClassRegExpFail() {
+  @PlaywrightTest
+  void hasClassRegExpFail(Page page) {
     page.setContent("<div class=\"bar baz\"></div>");
     Locator locator = page.locator("div");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -332,15 +331,15 @@ void hasClassRegExpFail() {
     assertTrue(e.getMessage().contains("Locator expected to have class matching regex"), e.getMessage());
   }
 
-  @Test
-  void hasClassTextArrayPass() {
+  @PlaywrightTest
+  void hasClassTextArrayPass(Page page) {
     page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
     Locator locator = page.locator("div");
     assertThat(locator).hasClass(new String[] {"foo", "bar", "baz"});
   }
 
-  @Test
-  void hasClassTextArrayFail() {
+  @PlaywrightTest
+  void hasClassTextArrayFail(Page page) {
     page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
     Locator locator = page.locator("div");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -351,15 +350,15 @@ void hasClassTextArrayFail() {
     assertTrue(e.getMessage().contains("Locator expected to have class"), e.getMessage());
   }
 
-  @Test
-  void hasClassRegExpArrayPass() {
+  @PlaywrightTest
+  void hasClassRegExpArrayPass(Page page) {
     page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
     Locator locator = page.locator("div");
     assertThat(locator).hasClass(new Pattern[] {Pattern.compile("fo.*"), Pattern.compile(".ar"), Pattern.compile("baz")});
   }
 
-  @Test
-  void hasClassRegExpArrayFail() {
+  @PlaywrightTest
+  void hasClassRegExpArrayFail(Page page) {
     page.setContent("<div class=\"foo\"></div><div class=\"bar\"></div><div class=\"baz\"></div>");
     Locator locator = page.locator("div");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -370,15 +369,15 @@ void hasClassRegExpArrayFail() {
     assertTrue(e.getMessage().contains("Locator expected to have class matching regex"), e.getMessage());
   }
 
-  @Test
-  void hasCountPass() {
+  @PlaywrightTest
+  void hasCountPass(Page page) {
     page.setContent("<select><option>One</option><option>Two</option></select>");
     Locator locator = page.locator("option");
     assertThat(locator).hasCount(2);
   }
 
-  @Test
-  void hasCountFail() {
+  @PlaywrightTest
+  void hasCountFail(Page page) {
     page.setContent("<select><option>One</option><option>Two</option></select>");
     Locator locator = page.locator("option");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -389,23 +388,23 @@ void hasCountFail() {
     assertTrue(e.getMessage().contains("Locator expected to have count"), e.getMessage());
   }
 
-  @Test
-  void hasCountPassZero() {
+  @PlaywrightTest
+  void hasCountPassZero(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("span");
     assertThat(locator).hasCount(0);
     assertThat(locator).not().hasCount(1);
   }
 
-  @Test
-  void hasCSSPass() {
+  @PlaywrightTest
+  void hasCSSPass(Page page) {
     page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasCSS("color", "rgb(255, 0, 0)");
   }
 
-  @Test
-  void hasCSSFail() {
+  @PlaywrightTest
+  void hasCSSFail(Page page) {
     page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -416,15 +415,15 @@ void hasCSSFail() {
     assertTrue(e.getMessage().contains("Locator expected to have CSS property 'color'"), e.getMessage());
   }
 
-  @Test
-  void hasCSSRegExPass() {
+  @PlaywrightTest
+  void hasCSSRegExPass(Page page) {
     page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasCSS("color", Pattern.compile("rgb.*"));
   }
 
-  @Test
-  void hasCSSRegExFail() {
+  @PlaywrightTest
+  void hasCSSRegExFail(Page page) {
     page.setContent("<div id=node style='color: rgb(255, 0, 0)'>Text content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -435,15 +434,15 @@ void hasCSSRegExFail() {
     assertTrue(e.getMessage().contains("Locator expected to have CSS property 'color' matching regex"), e.getMessage());
   }
 
-  @Test
-  void hasIdPass() {
+  @PlaywrightTest
+  void hasIdPass(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasId("node");
   }
 
-  @Test
-  void hasIdFail() {
+  @PlaywrightTest
+  void hasIdFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -454,16 +453,16 @@ void hasIdFail() {
     assertTrue(e.getMessage().contains("Locator expected to have ID"), e.getMessage());
   }
 
-  @Test
-  void hasJSPropertyPass() {
+  @PlaywrightTest
+  void hasJSPropertyPass(Page page) {
     page.setContent("<div></div>");
     page.evalOnSelector("div", "e => e.foo = { a: 1, b: 'string' }");
     Locator locator = page.locator("div");
     assertThat(locator).hasJSProperty("foo", mapOf("a", 1, "b", "string"));
   }
 
-  @Test
-  void hasJSPropertyNumberFail() {
+  @PlaywrightTest
+  void hasJSPropertyNumberFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     page.evalOnSelector("div", "e => e.foo = 2021");
@@ -475,8 +474,8 @@ void hasJSPropertyNumberFail() {
     assertTrue(e.getMessage().contains("Locator expected to have JavaScript property 'foo'"), e.getMessage());
   }
 
-  @Test
-  void hasJSPropertyObjectFail() {
+  @PlaywrightTest
+  void hasJSPropertyObjectFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     page.evalOnSelector("div", "e => e.foo = { a: 1, b: 'string' }");
@@ -488,8 +487,8 @@ void hasJSPropertyObjectFail() {
     assertTrue(e.getMessage().contains("Locator expected to have JavaScript property 'foo'"), e.getMessage());
   }
 
-  @Test
-  void hasJSPropertyStringFail() {
+  @PlaywrightTest
+  void hasJSPropertyStringFail(Page page) {
     page.setContent("<div id=node>Text content</div>");
     Locator locator = page.locator("#node");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -500,16 +499,16 @@ void hasJSPropertyStringFail() {
     assertTrue(e.getMessage().contains("Locator expected to have JavaScript property 'id'"), e.getMessage());
   }
 
-  @Test
-  void hasValueTextPass() {
+  @PlaywrightTest
+  void hasValueTextPass(Page page) {
     page.setContent("<input id=node></input>");
     Locator locator = page.locator("#node");
     locator.fill("Text content");
     assertThat(locator).hasValue("Text content");
   }
 
-  @Test
-  void hasValueTextFail() {
+  @PlaywrightTest
+  void hasValueTextFail(Page page) {
     page.setContent("<input id=node></input>");
     Locator locator = page.locator("#node");
     locator.fill("Text content");
@@ -521,24 +520,24 @@ void hasValueTextFail() {
     assertTrue(e.getMessage().contains("Locator expected to have value"), e.getMessage());
   }
 
-  @Test
-  void hasValueRegExpPass() {
+  @PlaywrightTest
+  void hasValueRegExpPass(Page page) {
     page.setContent("<input id=node></input>");
     Locator locator = page.locator("#node");
     locator.fill("Text content");
     assertThat(locator).hasValue(Pattern.compile("Text"));
   }
 
-  @Test
-  void hasValueRegExpPassWithNot() {
+  @PlaywrightTest
+  void hasValueRegExpPassWithNot(Page page) {
     page.setContent("<input id=node></input>");
     Locator locator = page.locator("#node");
     locator.fill("Text content");
     assertThat(locator).not().hasValue(Pattern.compile("Text2"));
   }
 
-  @Test
-  void hasValueRegExpFail() {
+  @PlaywrightTest
+  void hasValueRegExpFail(Page page) {
     page.setContent("<input id=node></input>");
     Locator locator = page.locator("#node");
     locator.fill("Text content");
@@ -550,8 +549,8 @@ void hasValueRegExpFail() {
     assertTrue(e.getMessage().contains("Locator expected to have value matching regex"), e.getMessage());
   }
 
-  @Test
-  void hasValuesWorksWithText() {
+  @PlaywrightTest
+  void hasValuesWorksWithText(Page page) {
     page.setContent("<select multiple>\n" +
       "              <option value=\"R\">Red</option>\n" +
       "              <option value=\"G\">Green</option>\n" +
@@ -562,8 +561,8 @@ void hasValuesWorksWithText() {
     assertThat(locator).hasValues(new String[]{"R", "G"});
   }
 
-  @Test
-  void hasValuesFollowsLabels() {
+  @PlaywrightTest
+  void hasValuesFollowsLabels(Page page) {
     page.setContent("<label for=\"colors\">Pick a Color</label>\n" +
       "            <select id=\"colors\" multiple>\n" +
       "              <option value=\"R\">Red</option>\n" +
@@ -575,8 +574,8 @@ void hasValuesFollowsLabels() {
     assertThat(locator).hasValues(new String[]{"R", "G"});
   }
 
-  @Test
-  void hasValuesExactMatchWithText() {
+  @PlaywrightTest
+  void hasValuesExactMatchWithText(Page page) {
     page.setContent("<select multiple>\n" +
       "              <option value=\"RR\">Red</option>\n" +
       "              <option value=\"GG\">Green</option>\n" +
@@ -591,8 +590,8 @@ void hasValuesExactMatchWithText() {
     assertTrue(e.getMessage().contains("Locator expected to have values"), e.getMessage());
   }
 
-  @Test
-  void hasValuesWorksWithRegex() {
+  @PlaywrightTest
+  void hasValuesWorksWithRegex(Page page) {
       page.setContent("<select multiple>\n" +
         "              <option value=\"R\">Red</option>\n" +
         "              <option value=\"G\">Green</option>\n" +
@@ -603,8 +602,8 @@ void hasValuesWorksWithRegex() {
     assertThat(locator).hasValues(new Pattern[]{ Pattern.compile("R"), Pattern.compile("G")});
   }
 
-  @Test
-  void hasValuesFailsWhenItemsNotSelected() {
+  @PlaywrightTest
+  void hasValuesFailsWhenItemsNotSelected(Page page) {
     page.setContent("<select multiple>\n" +
       "              <option value=\"R\">Red</option>\n" +
       "              <option value=\"G\">Green</option>\n" +
@@ -620,8 +619,8 @@ void hasValuesFailsWhenItemsNotSelected() {
     assertTrue(e.getMessage().contains("Locator expected to have values matching regex"), e.getMessage());
   }
 
-  @Test
-  void hasValuesFailsWhenMultipleNotSpecified() {
+  @PlaywrightTest
+  void hasValuesFailsWhenMultipleNotSpecified(Page page) {
     page.setContent("<select>\n" +
       "              <option value=\"R\">Red</option>\n" +
       "              <option value=\"G\">Green</option>\n" +
@@ -635,8 +634,8 @@ void hasValuesFailsWhenMultipleNotSpecified() {
     assertTrue(e.getMessage().contains("Not a select element with a multiple attribute"), e.getMessage());
   }
 
-  @Test
-  void hasValuesFailsWhenNotASelectElement() {
+  @PlaywrightTest
+  void hasValuesFailsWhenNotASelectElement(Page page) {
     page.setContent("<input value=\"foo\" />");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -645,15 +644,15 @@ void hasValuesFailsWhenNotASelectElement() {
     assertTrue(e.getMessage().contains("Not a select element with a multiple attribute"), e.getMessage());
   }
 
-  @Test
-  void isCheckedPass() {
+  @PlaywrightTest
+  void isCheckedPass(Page page) {
     page.setContent("<input type=checkbox checked></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isChecked();
   }
 
-  @Test
-  void isCheckedFail() {
+  @PlaywrightTest
+  void isCheckedFail(Page page) {
     page.setContent("<input type=checkbox></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -664,8 +663,8 @@ void isCheckedFail() {
     assertTrue(e.getMessage().contains("Locator expected to be\nExpected: checked"), e.getMessage());
   }
 
-  @Test
-  void notIsCheckedFail() {
+  @PlaywrightTest
+  void notIsCheckedFail(Page page) {
     page.setContent("<input type=checkbox checked></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -677,15 +676,15 @@ void notIsCheckedFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be\nExpected: checked"), e.getMessage());
   }
 
-  @Test
-  void isCheckedFalsePass() {
+  @PlaywrightTest
+  void isCheckedFalsePass(Page page) {
     page.setContent("<input type=checkbox></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isChecked(new LocatorAssertions.IsCheckedOptions().setChecked(false));
   }
 
-  @Test
-  void isCheckedFalseFail() {
+  @PlaywrightTest
+  void isCheckedFalseFail(Page page) {
     page.setContent("<input checked type=checkbox></input>");
     Locator locator = page.locator("input");
     AssertionFailedError error = assertThrows(AssertionFailedError.class,
@@ -693,15 +692,15 @@ void isCheckedFalseFail() {
     assertTrue(error.getMessage().contains("Locator expected to be\nExpected: unchecked"), error.getMessage());
   }
 
-  @Test
-  void isDisabledPass() {
+  @PlaywrightTest
+  void isDisabledPass(Page page) {
     page.setContent("<button disabled>Text</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isDisabled();
   }
 
-  @Test
-  void isDisabledFail() {
+  @PlaywrightTest
+  void isDisabledFail(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -712,8 +711,8 @@ void isDisabledFail() {
     assertTrue(e.getMessage().contains("Locator expected to be disabled"), e.getMessage());
   }
 
-  @Test
-  void notIsDisabledFail() {
+  @PlaywrightTest
+  void notIsDisabledFail(Page page) {
     page.setContent("<button disabled>Text</button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -724,15 +723,15 @@ void notIsDisabledFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be disabled"), e.getMessage());
   }
 
-  @Test
-  void isEditablePass() {
+  @PlaywrightTest
+  void isEditablePass(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isEditable();
   }
 
-  @Test
-  void isEditableFail() {
+  @PlaywrightTest
+  void isEditableFail(Page page) {
     page.setContent("<input disabled></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -743,8 +742,8 @@ void isEditableFail() {
     assertTrue(e.getMessage().contains("Locator expected to be editable"), e.getMessage());
   }
 
-  @Test
-  void isEditableFalseFail() {
+  @PlaywrightTest
+  void isEditableFalseFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError error = assertThrows(AssertionFailedError.class,
@@ -752,8 +751,8 @@ void isEditableFalseFail() {
     assertTrue(error.getMessage().contains("Locator expected to be readonly"), error.getMessage());
   }
 
-  @Test
-  void notIsEditableFail() {
+  @PlaywrightTest
+  void notIsEditableFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -764,51 +763,51 @@ void notIsEditableFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be editable"), e.getMessage());
   }
 
-  @Test
-  void isEditableWithNot() {
+  @PlaywrightTest
+  void isEditableWithNot(Page page) {
     page.setContent("<input readonly></input>");
     Locator locator = page.locator("input");
     assertThat(locator).not().isEditable();
   }
 
-  @Test
-  void isEditableWithEditableTrue() {
+  @PlaywrightTest
+  void isEditableWithEditableTrue(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isEditable(new LocatorAssertions.IsEditableOptions().setEditable(true));
   }
 
-  @Test
-  void isEditableWithEditableFalse() {
+  @PlaywrightTest
+  void isEditableWithEditableFalse(Page page) {
     page.setContent("<input readonly></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isEditable(new LocatorAssertions.IsEditableOptions().setEditable(false));
   }
 
-  @Test
-  void isEditableWithNotAndEditableFalse() {
+  @PlaywrightTest
+  void isEditableWithNotAndEditableFalse(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     assertThat(locator).not().isEditable(new LocatorAssertions.IsEditableOptions().setEditable(false));
   }
 
-  @Test
-  void isEditableThrowsOnNonInputElement() {
+  @PlaywrightTest
+  void isEditableThrowsOnNonInputElement(Page page) {
     page.setContent("<button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> assertThat(locator).isEditable());
     assertTrue(e.getMessage().contains("Element is not an <input>, <textarea>, <select> or [contenteditable] and does not have a role allowing [aria-readonly]"), e.getMessage());
   }
 
-  @Test
-  void isEmptyPass() {
+  @PlaywrightTest
+  void isEmptyPass(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isEmpty();
   }
 
-  @Test
-  void isEmptyFail() {
+  @PlaywrightTest
+  void isEmptyFail(Page page) {
     page.setContent("<input value=text></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -819,8 +818,8 @@ void isEmptyFail() {
     assertTrue(e.getMessage().contains("Locator expected to be empty"), e.getMessage());
   }
 
-  @Test
-  void notIsEmptyFail() {
+  @PlaywrightTest
+  void notIsEmptyFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -831,15 +830,15 @@ void notIsEmptyFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be empty"), e.getMessage());
   }
 
-  @Test
-  void isEnabledPass() {
+  @PlaywrightTest
+  void isEnabledPass(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isEnabled();
   }
 
-  @Test
-  void isEnabledFail() {
+  @PlaywrightTest
+  void isEnabledFail(Page page) {
     page.setContent("<button disabled>Text</button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -850,8 +849,8 @@ void isEnabledFail() {
     assertTrue(e.getMessage().contains("Locator expected to be enabled"), e.getMessage());
   }
 
-  @Test
-  void notIsEnabledFail() {
+  @PlaywrightTest
+  void notIsEnabledFail(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -862,22 +861,22 @@ void notIsEnabledFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be enabled"), e.getMessage());
   }
 
-  @Test
-  void isEnabledTrue() {
+  @PlaywrightTest
+  void isEnabledTrue(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isEnabled(new LocatorAssertions.IsEnabledOptions().setEnabled(true));
   }
 
-  @Test
-  void isEnabledFalse() {
+  @PlaywrightTest
+  void isEnabledFalse(Page page) {
     page.setContent("<button disabled>Text</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isEnabled(new LocatorAssertions.IsEnabledOptions().setEnabled(false));
   }
 
-  @Test
-  void isEnabledFalseFail() {
+  @PlaywrightTest
+  void isEnabledFalseFail(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     AssertionFailedError error = assertThrows(AssertionFailedError.class,
@@ -885,8 +884,8 @@ void isEnabledFalseFail() {
     assertTrue(error.getMessage().contains("Locator expected to be disabled"), error.getMessage());
   }
 
-  @Test
-  void isEnabledEventually() {
+  @PlaywrightTest
+  void isEnabledEventually(Page page) {
     page.setContent("<button disabled>Text</button>");
     Locator locator = page.locator("button");
     locator.evaluate("e => setTimeout(() => {\n" +
@@ -895,8 +894,8 @@ void isEnabledEventually() {
     assertThat(locator).isEnabled();
   }
 
-  @Test
-  void isEnabledEventuallyWithNot() {
+  @PlaywrightTest
+  void isEnabledEventuallyWithNot(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     locator.evaluate("e => setTimeout(() => {\n" +
@@ -905,23 +904,23 @@ void isEnabledEventuallyWithNot() {
     assertThat(locator).not().isEnabled();
   }
 
-  @Test
-  void isEnabledWithNotAndEnabledFalse() {
+  @PlaywrightTest
+  void isEnabledWithNotAndEnabledFalse(Page page) {
     page.setContent("<button>Text</button>");
     Locator locator = page.locator("button");
     assertThat(locator).not().isEnabled(new LocatorAssertions.IsEnabledOptions().setEnabled(false));
   }
 
-  @Test
-  void isFocusedPass() {
+  @PlaywrightTest
+  void isFocusedPass(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     locator.focus();
     assertThat(locator).isFocused();
   }
 
-  @Test
-  void isFocusedFail() {
+  @PlaywrightTest
+  void isFocusedFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -932,8 +931,8 @@ void isFocusedFail() {
     assertTrue(e.getMessage().contains("Locator expected to be focused"), e.getMessage());
   }
 
-  @Test
-  void notIsFocusedFail() {
+  @PlaywrightTest
+  void notIsFocusedFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     locator.focus();
@@ -945,15 +944,15 @@ void notIsFocusedFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be focused"), e.getMessage());
   }
 
-  @Test
-  void isHiddenPass() {
+  @PlaywrightTest
+  void isHiddenPass(Page page) {
     page.setContent("<button style='display: none'></button>");
     Locator locator = page.locator("button");
     assertThat(locator).isHidden();
   }
 
-  @Test
-  void isHiddenFail() {
+  @PlaywrightTest
+  void isHiddenFail(Page page) {
     page.setContent("<button></button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -964,8 +963,8 @@ void isHiddenFail() {
     assertTrue(e.getMessage().contains("Locator expected to be hidden"), e.getMessage());
   }
 
-  @Test
-  void notIsHiddenFail() {
+  @PlaywrightTest
+  void notIsHiddenFail(Page page) {
     page.setContent("<button style='display: none'></button>");
     Locator locator = page.locator("button");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -976,15 +975,15 @@ void notIsHiddenFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be hidden"), e.getMessage());
   }
 
-  @Test
-  void isVisiblePass() {
+  @PlaywrightTest
+  void isVisiblePass(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isVisible();
   }
 
-  @Test
-  void isVisibleFail() {
+  @PlaywrightTest
+  void isVisibleFail(Page page) {
     page.setContent("<input style='display: none'></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -995,8 +994,8 @@ void isVisibleFail() {
     assertTrue(e.getMessage().contains("Locator expected to be visible"), e.getMessage());
   }
 
-  @Test
-  void isVisibleFalseFail() {
+  @PlaywrightTest
+  void isVisibleFalseFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError error = assertThrows(AssertionFailedError.class,
@@ -1004,8 +1003,8 @@ void isVisibleFalseFail() {
     assertTrue(error.getMessage().contains("Locator expected to be hidden"), error.getMessage());
   }
 
-  @Test
-  void notIsVisibleFail() {
+  @PlaywrightTest
+  void notIsVisibleFail(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
@@ -1016,29 +1015,29 @@ void notIsVisibleFail() {
     assertTrue(e.getMessage().contains("Locator expected not to be visible"), e.getMessage());
   }
 
-  @Test
-  void isVisibleWithTrue() {
+  @PlaywrightTest
+  void isVisibleWithTrue(Page page) {
     page.setContent("<button>hello</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isVisible(new LocatorAssertions.IsVisibleOptions().setVisible(true));
   }
 
-  @Test
-  void isVisibleWithFalse() {
+  @PlaywrightTest
+  void isVisibleWithFalse(Page page) {
     page.setContent("<button hidden>hello</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isVisible(new LocatorAssertions.IsVisibleOptions().setVisible(false));
   }
 
-  @Test
-  void isVisibleWithNotAndFalse() {
+  @PlaywrightTest
+  void isVisibleWithNotAndFalse(Page page) {
     page.setContent("<button>hello</button>");
     Locator locator = page.locator("button");
     assertThat(locator).not().isVisible(new LocatorAssertions.IsVisibleOptions().setVisible(false));
   }
 
-  @Test
-  void isVisibleEventually() {
+  @PlaywrightTest
+  void isVisibleEventually(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("span");
     page.evalOnSelector("div", "div => setTimeout(() => {\n" +
@@ -1047,8 +1046,8 @@ void isVisibleEventually() {
     assertThat(locator).isVisible();
   }
 
-  @Test
-  void isVisibleEventuallyWithNot() {
+  @PlaywrightTest
+  void isVisibleEventuallyWithNot(Page page) {
     page.setContent("<div><span>Hello</span></div>");
     Locator locator = page.locator("span");
     page.evalOnSelector("span", "span => setTimeout(() => {\n" +
@@ -1057,15 +1056,15 @@ void isVisibleEventuallyWithNot() {
     assertThat(locator).not().isVisible();
   }
 
-  @Test
-  void locatorCountShouldWorkWithDeletedMapInMainWorld() {
+  @PlaywrightTest
+  void locatorCountShouldWorkWithDeletedMapInMainWorld(Page page) {
     page.evaluate("Map = 1");
     page.locator("#searchResultTableDiv .x-grid3-row").count();
     assertThat(page.locator("#searchResultTableDiv .x-grid3-row")).hasCount(0);
   }
 
-  @Test
-  void defaultTimeoutHasTextFail() {
+  @PlaywrightTest
+  void defaultTimeoutHasTextFail(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("div");
     PlaywrightAssertions.setDefaultAssertionTimeout(1000);
@@ -1075,8 +1074,8 @@ void defaultTimeoutHasTextFail() {
     PlaywrightAssertions.setDefaultAssertionTimeout(5_000);
   }
 
-  @Test
-  void defaultTimeoutHasTextPass() {
+  @PlaywrightTest
+  void defaultTimeoutHasTextPass(Page page) {
     page.setContent("<div>foo</div>");
     Locator locator = page.locator("div");
     PlaywrightAssertions.setDefaultAssertionTimeout(1000);
@@ -1085,8 +1084,8 @@ void defaultTimeoutHasTextPass() {
     PlaywrightAssertions.setDefaultAssertionTimeout(5_000);
   }
 
-  @Test
-  void defaultTimeoutZeroHasTextPass() {
+  @PlaywrightTest
+  void defaultTimeoutZeroHasTextPass(Page page) {
     page.setContent("<div>foo</div>");
     Locator locator = page.locator("div");
     PlaywrightAssertions.setDefaultAssertionTimeout(0);
@@ -1095,8 +1094,8 @@ void defaultTimeoutZeroHasTextPass() {
     PlaywrightAssertions.setDefaultAssertionTimeout(5_000);
   }
 
-  @Test
-  void containsClassPass() {
+  @PlaywrightTest
+  void containsClassPass(Page page) {
     page.setContent("<div class='foo bar baz'></div>");
     Locator locator = page.locator("div");
     assertThat(locator).containsClass("");
@@ -1106,15 +1105,15 @@ void containsClassPass() {
     assertThat(locator).not().containsClass("  baz not-matching");
   }
 
-  @Test
-  void containsClassPassWithSvgs() {
+  @PlaywrightTest
+  void containsClassPassWithSvgs(Page page) {
     page.setContent("<svg class='c1 c2' role='img' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'></svg>");
     assertThat(page.locator("svg")).containsClass("c1");
     assertThat(page.locator("svg")).containsClass("c2 c1");
   }
 
-  @Test
-  void containsClassFail() {
+  @PlaywrightTest
+  void containsClassFail(Page page) {
     page.setContent("<div class='bar baz'></div>");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
       assertThat(page.locator("div")).containsClass("does-not-exist", new ContainsClassOptions().setTimeout(1000));
@@ -1122,8 +1121,8 @@ void containsClassFail() {
     assertTrue(e.getMessage().contains("Assert \"containsClass\" locator(\"div\") with timeout 1000ms"), e.getMessage());
   }
 
-  @Test
-  void containsClassPassWithArray() {
+  @PlaywrightTest
+  void containsClassPassWithArray(Page page) {
     page.setContent("<div class='foo'></div><div class='hello bar'></div><div class='baz'></div>");
     Locator locator = page.locator("div");
     assertThat(locator).containsClass(asList("foo", "hello", "baz"));
@@ -1131,8 +1130,8 @@ void containsClassPassWithArray() {
     assertThat(locator).not().hasClass(new String[]{"foo", "hello"}); // length mismatch
   }
 
-  @Test
-  void containsClassFailWithArray() {
+  @PlaywrightTest
+  void containsClassFailWithArray(Page page) {
     page.setContent("<div class='foo'></div><div class='bar'></div><div class='bar'></div>");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
       assertThat(page.locator("div")).containsClass(asList("foo", "bar", "baz"), new ContainsClassOptions().setTimeout(1000));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions2.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions2.java
index 9f2a5b266..430106513 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions2.java
@@ -17,8 +17,8 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.LocatorAssertions;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
-import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 
 import java.util.regex.Pattern;
@@ -26,51 +26,51 @@
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestLocatorAssertions2 extends TestBase {
-  @Test
-  void isAttachedDefault() {
+public class TestLocatorAssertions2 {
+  @PlaywrightTest
+  void isAttachedDefault(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     assertThat(locator).isAttached();
   }
 
-  @Test
-  void isAttachedWithHiddenElement() {
+  @PlaywrightTest
+  void isAttachedWithHiddenElement(Page page) {
     page.setContent("<button style='display:none'>hello</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isAttached();
   }
 
-  @Test
-  void isAttachedWithNot() {
+  @PlaywrightTest
+  void isAttachedWithNot(Page page) {
     page.setContent("<button>hello</button>");
     Locator locator = page.locator("input");
     assertThat(locator).not().isAttached();
   }
 
-  @Test
-  void isAttachedWithAttachedTrue() {
+  @PlaywrightTest
+  void isAttachedWithAttachedTrue(Page page) {
     page.setContent("<button>hello</button>");
     Locator locator = page.locator("button");
     assertThat(locator).isAttached(new LocatorAssertions.IsAttachedOptions().setAttached(true));
   }
 
-  @Test
-  void isAttachedWithAttachedFalse() {
+  @PlaywrightTest
+  void isAttachedWithAttachedFalse(Page page) {
     page.setContent("<button>hello</button>");
     Locator locator = page.locator("input");
     assertThat(locator).isAttached(new LocatorAssertions.IsAttachedOptions().setAttached(false));
   }
 
-  @Test
-  void isAttachedWithNotAndAttachedFalse() {
+  @PlaywrightTest
+  void isAttachedWithNotAndAttachedFalse(Page page) {
     page.setContent("<button>hello</button>");
     Locator locator = page.locator("button");
     assertThat(locator).not().isAttached(new LocatorAssertions.IsAttachedOptions().setAttached(false));
   }
 
-  @Test
-  void isAttachedEventually() {
+  @PlaywrightTest
+  void isAttachedEventually(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("span");
     page.evalOnSelector("div", "div => setTimeout(() => {\n" +
@@ -79,8 +79,8 @@ void isAttachedEventually() {
     assertThat(locator).isAttached();
   }
 
-  @Test
-  void isAttachedEventuallyWithNot() {
+  @PlaywrightTest
+  void isAttachedEventuallyWithNot(Page page) {
     page.setContent("<div><span>Hello</span></div>");
     Locator locator = page.locator("span");
     page.evalOnSelector("div", "div => setTimeout(() => {\n" +
@@ -89,8 +89,8 @@ void isAttachedEventuallyWithNot() {
     assertThat(locator).not().isAttached();
   }
 
-  @Test
-  void isAttachedFail() {
+  @PlaywrightTest
+  void isAttachedFail(Page page) {
     page.setContent("<button>Hello</button>");
     Locator locator = page.locator("input");
     AssertionFailedError error = assertThrows(AssertionFailedError.class,
@@ -98,8 +98,8 @@ void isAttachedFail() {
     assertFalse(error.getMessage().contains("locator resolved to"), error.getMessage());
   }
 
-  @Test
-  void isAttachedFailWithNot() {
+  @PlaywrightTest
+  void isAttachedFailWithNot(Page page) {
     page.setContent("<input></input>");
     Locator locator = page.locator("input");
     AssertionFailedError error = assertThrows(AssertionFailedError.class,
@@ -107,20 +107,20 @@ void isAttachedFailWithNot() {
     assertTrue(error.getMessage().contains("locator resolved to <input/>"), error.getMessage());
   }
 
-  @Test
-  void isAttachedWithImpossibleTimeout() {
+  @PlaywrightTest
+  void isAttachedWithImpossibleTimeout(Page page) {
     page.setContent("<div id=node>Text content</div>");
     assertThat(page.locator("#node")).isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1));
   }
 
-  @Test
-  void isAttachedWithImpossibleTimeoutNot() {
+  @PlaywrightTest
+  void isAttachedWithImpossibleTimeoutNot(Page page) {
     page.setContent("<div id=node>Text content</div>");
     assertThat(page.locator("no-such-thing")).not().isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1));
   }
 
-  @Test
-  public void toHaveAccessibleName() {
+  @PlaywrightTest
+  public void toHaveAccessibleName(Page page) {
     page.setContent("<div role=\"button\" aria-label=\"Hello\"></div>");
 
     assertThat(page.locator("div")).hasAccessibleName("Hello");
@@ -134,8 +134,8 @@ public void toHaveAccessibleName() {
     assertThat(page.locator("button")).hasAccessibleName("foo bar baz");
   }
 
-  @Test
-  public void toHaveAccessibleDescription() {
+  @PlaywrightTest
+  public void toHaveAccessibleDescription(Page page) {
     page.setContent("<div role=\"button\" aria-description=\"Hello\"></div>");
 
     assertThat(page.locator("div")).hasAccessibleDescription("Hello");
@@ -150,16 +150,16 @@ public void toHaveAccessibleDescription() {
     assertThat(page.locator("div")).hasAccessibleDescription("foo bar baz");
   }
 
-  @Test
-  public void toHaveRole() {
+  @PlaywrightTest
+  public void toHaveRole(Page page) {
     page.setContent("<div role=\"button\">Button!</div>");
 
     assertThat(page.locator("div")).hasRole(AriaRole.BUTTON);
     assertThat(page.locator("div")).not().hasRole(AriaRole.CHECKBOX);
   }
 
-  @Test
-  void toHaveAccessibleErrorMessage() {
+  @PlaywrightTest
+  void toHaveAccessibleErrorMessage(Page page) {
     page.setContent("<form>" +
       "<input role=\"textbox\" aria-invalid=\"true\" aria-errormessage=\"error-message\" />" +
       "<div id=\"error-message\">Hello</div>" +
@@ -176,8 +176,8 @@ void toHaveAccessibleErrorMessage() {
     assertThat(locator).not().hasAccessibleErrorMessage("This should not be considered.");
   }
 
-  @Test
-  void toHaveAccessibleErrorMessageShouldHandleMultipleAriaErrorMessageReferences() {
+  @PlaywrightTest
+  void toHaveAccessibleErrorMessageShouldHandleMultipleAriaErrorMessageReferences(Page page) {
     page.setContent("<form>\n" +
       "  <input role=\"textbox\" aria-invalid=\"true\" aria-errormessage=\"error1 error2\" />\n" +
       "  <div id=\"error1\">First error message.</div>\n" +
@@ -193,16 +193,16 @@ void toHaveAccessibleErrorMessageShouldHandleMultipleAriaErrorMessageReferences(
     assertThat(locator).not().hasAccessibleErrorMessage(Pattern.compile("This should not be considered.", Pattern.CASE_INSENSITIVE));
   }
 
-  @Test
-  void toBeEditableWithIndeterminateTrue() {
+  @PlaywrightTest
+  void toBeEditableWithIndeterminateTrue(Page page) {
     page.setContent("<input type=checkbox></input>");
     page.locator("input").evaluate("e => e.indeterminate = true");
     Locator locator = page.locator("input");
     assertThat(locator).isChecked(new LocatorAssertions.IsCheckedOptions().setIndeterminate(true));
   }
 
-  @Test
-  void toBeEditableWithIndeterminateTrueAndChecked() {
+  @PlaywrightTest
+  void toBeEditableWithIndeterminateTrueAndChecked(Page page) {
     page.setContent("<input type=checkbox></input>");
     page.locator("input").evaluate("e => e.indeterminate = true");
     Locator locator = page.locator("input");
@@ -211,8 +211,8 @@ void toBeEditableWithIndeterminateTrueAndChecked() {
     assertTrue(e.getMessage().contains("Can't assert indeterminate and checked at the same time"), e.getMessage());
   }
 
-  @Test
-  void toBeEditableFailWithIndeterminateTrue() {
+  @PlaywrightTest
+  void toBeEditableFailWithIndeterminateTrue(Page page) {
     page.setContent("<input type=checkbox></input>");
     Locator locator = page.locator("input");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () ->
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java
index 395e595b8..71ba3539d 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorClick.java
@@ -16,28 +16,30 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.KeyboardModifier;
 import com.microsoft.playwright.options.ScrollMode;
 import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
 @Tag("smoke")
-public class TestLocatorClick extends TestBase {
+public class TestLocatorClick {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     Locator button = page.locator("button");
     button.click();
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldWorkWithNodeRemoved() {
+  @PlaywrightTest
+  void shouldWorkWithNodeRemoved(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => delete window['Node']");
     Locator button  = page.locator("button");
@@ -45,8 +47,8 @@ void shouldWorkWithNodeRemoved() {
     assertEquals("Clicked", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldDoubleClickTheButton() {
+  @PlaywrightTest
+  void shouldDoubleClickTheButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     page.evaluate("() => {\n" +
       "  window['double'] = false;\n" +
@@ -61,16 +63,16 @@ void shouldDoubleClickTheButton() {
     assertEquals("Clicked", page.evaluate("result"));
   }
 
-  @Test
-  void shouldSupportCotrolOrMetaModifier() {
+  @PlaywrightTest
+  void shouldSupportCotrolOrMetaModifier(Page page, Server server) {
     page.setContent("<a href='" + server.PREFIX + "/title.html'>Go</a>");
     Page newPage = page.context().waitForPage(() ->
       page.getByText("Go").click(new Locator.ClickOptions().setModifiers(asList(KeyboardModifier.CONTROLORMETA))));
     assertThat(newPage).hasURL(server.PREFIX + "/title.html");
   }
 
-  @Test
-  void shouldClickWithTweenedMouseMovement() {
+  @PlaywrightTest
+  void shouldClickWithTweenedMouseMovement(Page page, BrowserName browserName) {
     page.setContent(
       "<body style=\"margin: 0; padding: 0; height: 500px; width: 500px;\">\n" +
       "  <div style=\"position: relative; top: 280px; left: 150px; width: 100px; height: 40px\">Click me</div>\n" +
@@ -78,7 +80,7 @@ void shouldClickWithTweenedMouseMovement() {
     );
 
     // The test becomes flaky on WebKit without next line.
-    if (isWebKit()) {
+    if (browserName == WEBKIT) {
       page.evaluate("() => new Promise(requestAnimationFrame)");
     }
 
@@ -106,8 +108,8 @@ void shouldClickWithTweenedMouseMovement() {
     );
   }
 
-  @Test
-  void shouldNotScrollWhenScrollIsNone() {
+  @PlaywrightTest
+  void shouldNotScrollWhenScrollIsNone(Page page) {
     page.setContent("<div style='height: 2000px;'>filler</div>\n" +
       "<button onclick='window._clicked=true'>click me</button>");
     PlaywrightException e = assertThrows(PlaywrightException.class,
@@ -117,8 +119,8 @@ void shouldNotScrollWhenScrollIsNone() {
     assertEquals(0, page.evaluate("() => window.scrollY"));
   }
 
-  @Test
-  void shouldClickInViewportElementWhenScrollIsNone() {
+  @PlaywrightTest
+  void shouldClickInViewportElementWhenScrollIsNone(Page page) {
     page.setContent("<button onclick='window._clicked=true'>click me</button>\n" +
       "<div style='height: 2000px;'></div>");
     page.locator("button").click(new Locator.ClickOptions().setScroll(ScrollMode.NONE).setTimeout(2000));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java
index add338260..15ccf26cd 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorConvenience.java
@@ -16,14 +16,14 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestLocatorConvenience extends TestBase {
-  @Test
-  void shouldHaveANicePreview() {
+public class TestLocatorConvenience {
+  @PlaywrightTest
+  void shouldHaveANicePreview(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     Locator outer = page.locator("#outer");
     Locator inner = outer.locator("#inner");
@@ -36,8 +36,8 @@ void shouldHaveANicePreview() {
     assertEquals("Locator@#check", check.toString());
   }
 
-  @Test
-  void getAttributeShouldWork() {
+  @PlaywrightTest
+  void getAttributeShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     Locator locator = page.locator("#outer");
     assertEquals("value", locator.getAttribute("name"));
@@ -46,8 +46,8 @@ void getAttributeShouldWork() {
     assertNull(page.getAttribute("#outer", "foo"));
   }
 
-  @Test
-  void inputValueShouldWork() {
+  @PlaywrightTest
+  void inputValueShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
 
     page.selectOption("#select", "foo");
@@ -70,24 +70,24 @@ void inputValueShouldWork() {
     assertTrue(e.getMessage().contains("Node is not an <input>, <textarea> or <select> element"), e.getMessage());
   }
 
-  @Test
-  void innerHTMLShouldWork() {
+  @PlaywrightTest
+  void innerHTMLShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     Locator locator = page.locator("#outer");
     assertEquals("<div id=\"inner\">Text,\nmore text</div>", locator.innerHTML());
     assertEquals("<div id=\"inner\">Text,\nmore text</div>", page.innerHTML("#outer"));
   }
 
-  @Test
-  void innerTextShouldWork() {
+  @PlaywrightTest
+  void innerTextShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     Locator locator = page.locator("#inner");
     assertEquals("Text, more text", locator.innerText());
     assertEquals("Text, more text", page.innerText("#inner"));
   }
 
-  @Test
-  void innerTextShouldThrow() {
+  @PlaywrightTest
+  void innerTextShouldThrow(Page page) {
     page.setContent("<svg>text</svg>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.innerText("svg"));
     assertTrue(e.getMessage().contains("Node is not an HTMLElement"), e.getMessage());
@@ -97,16 +97,16 @@ void innerTextShouldThrow() {
     assertTrue(e.getMessage().contains("Node is not an HTMLElement"), e.getMessage());
   }
 
-  @Test
-  void textContentShouldWork() {
+  @PlaywrightTest
+  void textContentShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/dom.html");
     Locator locator = page.locator("#inner");
     assertEquals("Text,\nmore text", locator.textContent());
     assertEquals("Text,\nmore text", page.textContent("#inner"));
   }
 
-  @Test
-  void isVisibleAndIsHiddenShouldWork() {
+  @PlaywrightTest
+  void isVisibleAndIsHiddenShouldWork(Page page) {
     page.setContent("<div>Hi</div><span></span>");
 
     Locator div = page.locator("div");
@@ -125,8 +125,8 @@ void isVisibleAndIsHiddenShouldWork() {
     assertTrue(page.isHidden("no-such-element"));
   }
 
-  @Test
-  void isEnabledAndIsDisabledShouldWork() {
+  @PlaywrightTest
+  void isEnabledAndIsDisabledShouldWork(Page page) {
     page.setContent("<button disabled>button1</button>\n" +
       "<button>button2</button>\n" +
       "<div>div</div>");
@@ -147,8 +147,8 @@ void isEnabledAndIsDisabledShouldWork() {
     assertEquals(false, page.isDisabled(":text('button2')"));
   }
 
-  @Test
-  void isEditableShouldWork() {
+  @PlaywrightTest
+  void isEditableShouldWork(Page page) {
     page.setContent("<input id=input1 disabled><textarea></textarea><input id=input2>");
     page.evalOnSelector("textarea", "t => t.readOnly = true");
     Locator input1 = page.locator("#input1");
@@ -162,8 +162,8 @@ void isEditableShouldWork() {
     assertFalse(page.isEditable("textarea"));
   }
 
-  @Test
-  void isCheckedShouldWork() {
+  @PlaywrightTest
+  void isCheckedShouldWork(Page page) {
     page.setContent("<input type='checkbox' checked><div>Not a checkbox</div>");
     Locator element = page.locator("input");
     assertTrue(element.isChecked());
@@ -175,62 +175,62 @@ void isCheckedShouldWork() {
     assertTrue(e.getMessage().contains("Not a checkbox or radio button"));
   }
 
-  @Test
-  void allTextContentsShouldWork() {
+  @PlaywrightTest
+  void allTextContentsShouldWork(Page page) {
     page.setContent("<div>A</div><div>B</div><div>C</div>");
     assertEquals(asList("A", "B", "C"), page.locator("div").allTextContents());
   }
 
-  @Test
-  void allInnerTextsShouldWork() {
+  @PlaywrightTest
+  void allInnerTextsShouldWork(Page page) {
     page.setContent("<div>A</div><div>B</div><div>C</div>");
     assertEquals(asList("A", "B", "C"), page.locator("div").allInnerTexts());
   }
 
-  @Test
-  void descriptionShouldReturnNullForUndescribedLocators() {
+  @PlaywrightTest
+  void descriptionShouldReturnNullForUndescribedLocators(Page page) {
     page.setContent("<div>Hello</div>");
     Locator locator = page.locator("div");
     assertNull(locator.description());
   }
 
-  @Test
-  void descriptionShouldReturnSimpleDescription() {
+  @PlaywrightTest
+  void descriptionShouldReturnSimpleDescription(Page page) {
     page.setContent("<div>Hello</div>");
     Locator locator = page.locator("div").describe("my div");
     assertEquals("my div", locator.description());
   }
 
-  @Test
-  void descriptionShouldHandleSpecialCharacters() {
+  @PlaywrightTest
+  void descriptionShouldHandleSpecialCharacters(Page page) {
     page.setContent("<div>Hello</div>");
     Locator locator = page.locator("div").describe("título 😊");
     assertEquals("título 😊", locator.description());
   }
 
-  @Test
-  void descriptionShouldWorkWithChainedLocators() {
+  @PlaywrightTest
+  void descriptionShouldWorkWithChainedLocators(Page page) {
     page.setContent("<div><span>Hello</span></div>");
     Locator locator = page.locator("div").describe("container").locator("span");
     assertNull(locator.description());
   }
 
-  @Test
-  void descriptionShouldReturnLastDescriptionForMultipleCalls() {
+  @PlaywrightTest
+  void descriptionShouldReturnLastDescriptionForMultipleCalls(Page page) {
     page.setContent("<div>Hello</div>");
     Locator locator = page.locator("div").describe("first").describe("second");
     assertEquals("second", locator.description());
   }
 
-  @Test
-  void toStringShouldReturnFormattedLocator() {
+  @PlaywrightTest
+  void toStringShouldReturnFormattedLocator(Page page) {
     page.setContent("<div>Hello</div>");
     Locator locator = page.locator("div");
     assertTrue(locator.toString().startsWith("Locator@"));
   }
 
-  @Test
-  void toStringShouldPreferDescription() {
+  @PlaywrightTest
+  void toStringShouldPreferDescription(Page page) {
     page.setContent("<div>Hello</div>");
     Locator locator = page.locator("div").describe("my div");
     assertEquals("my div", locator.toString());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorElementHandle.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorElementHandle.java
index 385abc2d0..8770c152f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorElementHandle.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorElementHandle.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,9 +24,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestLocatorElementHandle extends TestBase {
-  @Test
-  void shouldQueryExistingElement() {
+public class TestLocatorElementHandle {
+  @PlaywrightTest
+  void shouldQueryExistingElement(Page page, Server server) {
     page.navigate(server.PREFIX + "/playground.html");
     page.setContent("<html><body><div class='second'><div class='inner'>A</div></div></body></html>");
     Locator html = page.locator("html");
@@ -36,8 +36,8 @@ void shouldQueryExistingElement() {
     assertEquals("A", content);
   }
 
-  @Test
-  void shouldQueryExistingElements() {
+  @PlaywrightTest
+  void shouldQueryExistingElements(Page page) {
     page.setContent("<html><body><div>A</div><br/><div>B</div></body></html>");
     Locator html = page.locator("html");
     List<ElementHandle> elements = html.locator("div").elementHandles();
@@ -47,8 +47,8 @@ void shouldQueryExistingElements() {
     assertEquals(asList("A", "B"), texts);
   }
 
-  @Test
-  void shouldReturnEmptyArrayForNonExistingElements() {
+  @PlaywrightTest
+  void shouldReturnEmptyArrayForNonExistingElements(Page page) {
     page.setContent("<html><body><span>A</span><br/><span>B</span></body></html>");
     Locator html = page.locator("html");
     List<ElementHandle> elements = html.locator("div").elementHandles();
@@ -56,8 +56,8 @@ void shouldReturnEmptyArrayForNonExistingElements() {
   }
 
 
-  @Test
-  void xpathShouldQueryExistingElement() {
+  @PlaywrightTest
+  void xpathShouldQueryExistingElement(Page page, Server server) {
     page.navigate(server.PREFIX + "/playground.html");
     page.setContent("<html><body><div class='second'><div class='inner'>A</div></div></body></html>");
     Locator html = page.locator("html");
@@ -67,8 +67,8 @@ void xpathShouldQueryExistingElement() {
     assertEquals("A", content);
   }
 
-  @Test
-  void xpathShouldReturnNullForNonExistingElement() {
+  @PlaywrightTest
+  void xpathShouldReturnNullForNonExistingElement(Page page) {
     page.setContent("<html><body><div class='second'><div class='inner'>B</div></div></body></html>");
     Locator html = page.locator("html");
     List<ElementHandle> second = html.locator("xpath=/div[contains(@class, 'third')]").elementHandles();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorEvaluate.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorEvaluate.java
index d5b4b4b63..92ec99d32 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorEvaluate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorEvaluate.java
@@ -16,22 +16,22 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestLocatorEvaluate extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestLocatorEvaluate {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     page.setContent("<html><body><div class='tweet'><div class='like'>100</div><div class='retweets'>10</div></div></body></html>");
     Locator tweet = page.locator(".tweet .like");
     Object content = tweet.evaluate("node => node.innerText");
     assertEquals("100", content);
   }
 
-  @Test
-  void shouldRetrieveContentFromSubtree() {
+  @PlaywrightTest
+  void shouldRetrieveContentFromSubtree(Page page) {
     String htmlContent = "<div class='a'>not-a-child-div</div><div id='myId'><div class='a'>a-child-div</div></div>";
     page.setContent(htmlContent);
     Locator locator = page.locator("#myId .a");
@@ -39,16 +39,16 @@ void shouldRetrieveContentFromSubtree() {
     assertEquals("a-child-div", content);
   }
 
-  @Test
-  void shouldWorkForAll() {
+  @PlaywrightTest
+  void shouldWorkForAll(Page page) {
     page.setContent("<html><body><div class='tweet'><div class='like'>100</div><div class='like'>10</div></div></body></html>");
     Locator tweet = page.locator(".tweet .like");
     Object content = tweet.evaluateAll("nodes => nodes.map(n => n.innerText)");
     assertEquals(asList("100", "10"), content);
   }
 
-  @Test
-  void shouldRetrieveContentFromSubtreeForAll() {
+  @PlaywrightTest
+  void shouldRetrieveContentFromSubtreeForAll(Page page) {
     String htmlContent = "<div class='a'>not-a-child-div</div><div id='myId'><div class='a'>a1-child-div</div><div class='a'>a2-child-div</div></div>";
     page.setContent(htmlContent);
     Locator element = page.locator("#myId .a");
@@ -56,8 +56,8 @@ void shouldRetrieveContentFromSubtreeForAll() {
     assertEquals(asList("a1-child-div", "a2-child-div"), content);
   }
 
-  @Test
-  void shouldNotThrowInCaseOfMissingSelectorForAll() {
+  @PlaywrightTest
+  void shouldNotThrowInCaseOfMissingSelectorForAll(Page page) {
     String htmlContent = "<div class='a'>not-a-child-div</div><div id='myId'></div>";
     page.setContent(htmlContent);
     Locator element = page.locator("#myId .a");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorFrame.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorFrame.java
index e9c039d62..3c9f2a1a9 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorFrame.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorFrame.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
-import org.junit.jupiter.api.Test;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -25,7 +25,7 @@
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestLocatorFrame extends TestBase {
+public class TestLocatorFrame {
   private static void routeIframe(Page page) {
     page.route("**/empty.html", route -> route.fulfill(new Route.FulfillOptions()
       .setBody("<iframe src='iframe.html' name='frame1'></iframe>").setContentType("text/html")));
@@ -65,8 +65,8 @@ private static void routeAmbiguous(Page page) {
     });
   }
 
-  @Test
-  void shouldWorkForIframe() {
+  @PlaywrightTest
+  void shouldWorkForIframe(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.frameLocator("iframe").locator("button");
@@ -76,8 +76,8 @@ void shouldWorkForIframe() {
     button.click();
   }
 
-  @Test
-  void shouldWorkForNestedIframe() {
+  @PlaywrightTest
+  void shouldWorkForNestedIframe(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.frameLocator("iframe").frameLocator("iframe").locator("button");
@@ -87,8 +87,8 @@ void shouldWorkForNestedIframe() {
     button.click();
   }
 
-  @Test
-  void shouldWorkForAnd() {
+  @PlaywrightTest
+  void shouldWorkForAnd(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator locator = page.frameLocator("iframe").locator("button");
@@ -98,8 +98,8 @@ void shouldWorkForAnd() {
     assertThat(spans).hasCount(2);
   }
 
-  @Test
-  void shouldWaitForFrame() {
+  @PlaywrightTest
+  void shouldWaitForFrame(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.frameLocator("iframe").locator("span").click(new Locator.ClickOptions().setTimeout(300));
@@ -107,8 +107,8 @@ void shouldWaitForFrame() {
     assertTrue(e.getMessage().contains("waiting for locator(\"iframe\").contentFrame()"), e.getMessage());
   }
 
-  @Test
-  void shouldWaitForFrame2() {
+  @PlaywrightTest
+  void shouldWaitForFrame2(Page page, Server server) {
     routeIframe(page);
     page.evaluate("url => setTimeout(() => location.href = url, 300)", server.EMPTY_PAGE);
     page.frameLocator("iframe").locator("button").click();
@@ -117,26 +117,26 @@ void shouldWaitForFrame2() {
   void shouldWaitForFrameToGo() {
   }
 
-  @Test
-  void shouldNotWaitForFrame() {
+  @PlaywrightTest
+  void shouldNotWaitForFrame(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertThat(page.frameLocator("iframe").locator("span")).isHidden();
   }
 
-  @Test
-  void shouldNotWaitForFrame2() {
+  @PlaywrightTest
+  void shouldNotWaitForFrame2(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertThat(page.frameLocator("iframe").locator("span")).not().isVisible();
   }
 
-  @Test
-  void shouldNotWaitForFrame3() {
+  @PlaywrightTest
+  void shouldNotWaitForFrame3(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertThat(page.frameLocator("iframe").locator("span")).hasCount(0);
   }
 
-  @Test
-  void shouldClickInLazyIframe() {
+  @PlaywrightTest
+  void shouldClickInLazyIframe(Page page, Server server) {
     page.route("**/iframe.html", route -> {
       route.fulfill(new Route.FulfillOptions().setBody("<html><button>Hello iframe</button></html>").setContentType("text/html"));
     });
@@ -157,8 +157,8 @@ void shouldClickInLazyIframe() {
     assertEquals("Hello iframe", button.innerText());
   }
 
-  @Test
-  void waitForShouldSurviveFrameReattach() {
+  @PlaywrightTest
+  void waitForShouldSurviveFrameReattach(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.frameLocator("iframe").locator("button:has-text('Hello nested iframe')");
@@ -173,8 +173,8 @@ void waitForShouldSurviveFrameReattach() {
     button.waitFor();
   }
 
-  @Test
-  void clickShouldSurviveFrameReattach() {
+  @PlaywrightTest
+  void clickShouldSurviveFrameReattach(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.frameLocator("iframe").locator("button:has-text('Hello nested iframe')");
@@ -190,8 +190,8 @@ void clickShouldSurviveFrameReattach() {
     button.click();
   }
 
-  @Test
-  void clickShouldSurviveIframeNavigation() {
+  @PlaywrightTest
+  void clickShouldSurviveIframeNavigation(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.frameLocator("iframe").locator("button:has-text('Hello nested iframe')");
@@ -201,8 +201,8 @@ void clickShouldSurviveIframeNavigation() {
     button.click();
   }
 
-  @Test
-  void shouldNonWorkForNonFrame() {
+  @PlaywrightTest
+  void shouldNonWorkForNonFrame(Page page) {
     routeIframe(page);
     page.setContent("<div></div>");
     Locator button = page.frameLocator("div").locator("button");
@@ -211,8 +211,8 @@ void shouldNonWorkForNonFrame() {
     assertTrue(e.getMessage().contains("<iframe> was expected"), e.getMessage());
   }
 
-  @Test
-  void locatorFrameLocatorShouldWorkForIframe() {
+  @PlaywrightTest
+  void locatorFrameLocatorShouldWorkForIframe(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.locator("body").frameLocator("iframe").locator("button");
@@ -222,8 +222,8 @@ void locatorFrameLocatorShouldWorkForIframe() {
     button.click();
   }
 
-  @Test
-  void locatorFrameLocatorShouldThrowOnAmbiguity() {
+  @PlaywrightTest
+  void locatorFrameLocatorShouldThrowOnAmbiguity(Page page, Server server) {
     routeAmbiguous(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button = page.locator("body").frameLocator("iframe").locator("button");
@@ -231,8 +231,8 @@ void locatorFrameLocatorShouldThrowOnAmbiguity() {
     assertTrue(e.getMessage().contains("Error: strict mode violation: locator(\"body\").locator(\"iframe\") resolved to 3 elements"), e.getMessage());
   }
 
-  @Test
-  void locatorFrameLocatorShouldNotThrowOnFirstLastNth() {
+  @PlaywrightTest
+  void locatorFrameLocatorShouldNotThrowOnFirstLastNth(Page page, Server server) {
     routeAmbiguous(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button1 = page.locator("body").frameLocator("iframe").first().locator("button");
@@ -243,8 +243,8 @@ void locatorFrameLocatorShouldNotThrowOnFirstLastNth() {
     assertThat(button3).hasText("Hello from iframe-3.html");
   }
 
-  @Test
-  void getByCoverage() {
+  @PlaywrightTest
+  void getByCoverage(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator button1 = page.frameLocator("iframe").getByRole(AriaRole.BUTTON);
@@ -263,8 +263,8 @@ void getByCoverage() {
     assertThat(input4).hasValue("");
   }
 
-  @Test
-  void locatorContentFrameShouldWork() {
+  @PlaywrightTest
+  void locatorContentFrameShouldWork(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     Locator locator = page.locator("iframe");
@@ -275,8 +275,8 @@ void locatorContentFrameShouldWork() {
     button.click();
   }
 
-  @Test
-  void frameLocatorOwnerShouldWork() {
+  @PlaywrightTest
+  void frameLocatorOwnerShouldWork(Page page, Server server) {
     routeIframe(page);
     page.navigate(server.EMPTY_PAGE);
     FrameLocator frameLocator = page.frameLocator("iframe");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java
index c85226cc0..6947dca7e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorHighlight.java
@@ -17,17 +17,17 @@
 package com.microsoft.playwright;
 
 import com.google.gson.Gson;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BoundingBox;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestLocatorHighlight extends TestBase {
+public class TestLocatorHighlight {
   @Disabled("Requires isUnderTest to be true https://github.com/microsoft/playwright/pull/12420")
-  @Test
-  void shouldHighlightLocator() {
+  @PlaywrightTest
+  void shouldHighlightLocator(Page page) {
     page.setContent("<input type='text' />");
     page.locator("input").highlight();
     assertThat(page.locator("x-pw-tooltip")).hasText("input");
@@ -37,8 +37,8 @@ void shouldHighlightLocator() {
     assertEquals(new Gson().toJson(box2), new Gson().toJson(box1));
   }
 
-  @Test
-  void highlightAndHideHighlightShouldNotThrow() {
+  @PlaywrightTest
+  void highlightAndHideHighlightShouldNotThrow(Page page) {
     page.setContent("<input type='text' />");
     AutoCloseable disposable = page.locator("input").highlight(new Locator.HighlightOptions().setStyle("outline: 2px dashed red"));
     try {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorList.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorList.java
index 2d30c2bc7..de9c80c8d 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorList.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorList.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestLocatorList extends TestBase {
-  @Test
-  void locatorAllShouldWork() {
+public class TestLocatorList {
+  @PlaywrightTest
+  void locatorAllShouldWork(Page page) {
     page.setContent("<div><p>A</p><p>B</p><p>C</p></div>");
     List<String> texts = new ArrayList<>();
     for (Locator p : page.locator("div >> p").all()) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java
index cdc039dda..9c53ac2e8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestLocatorMisc.java
@@ -16,17 +16,17 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.WaitForSelectorState;
-import org.junit.jupiter.api.Test;
 
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestLocatorMisc extends TestBase{
-  @Test
-  void shouldCheckTheBoxUsingSetChecked() {
+public class TestLocatorMisc{
+  @PlaywrightTest
+  void shouldCheckTheBoxUsingSetChecked(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     Locator input = page.locator("input");
     input.setChecked(true);
@@ -35,8 +35,8 @@ void shouldCheckTheBoxUsingSetChecked() {
     assertEquals(false, page.evaluate("checkbox.checked"));
   }
 
-  @Test
-  void shouldWaitFor() {
+  @PlaywrightTest
+  void shouldWaitFor(Page page) {
     page.setContent("<div></div>");
     Locator locator = page.locator("span");
     page.evalOnSelector("div", "div => setTimeout(() => div.innerHTML = '<span>target</span>', 500)");
@@ -44,16 +44,16 @@ void shouldWaitFor() {
     assertTrue(locator.textContent().contains("target"));
   }
 
-  @Test
-  void shouldWaitForHidden() {
+  @PlaywrightTest
+  void shouldWaitForHidden(Page page) {
     page.setContent("<div><span>target</span></div>");
     Locator locator = page.locator("span");
     page.evalOnSelector("div", "div => setTimeout(() => div.innerHTML = '', 500)");
     locator.waitFor(new Locator.WaitForOptions().setState(WaitForSelectorState.HIDDEN));
   }
 
-  @Test
-  void locatorsHasDoesNotEncodeUnicode() {
+  @PlaywrightTest
+  void locatorsHasDoesNotEncodeUnicode(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Locator[] locators = new Locator[]{
       page.locator("button", new Page.LocatorOptions().setHasText("Драматург")),
@@ -68,8 +68,8 @@ void locatorsHasDoesNotEncodeUnicode() {
     }
   }
 
-  @Test
-  void shouldClearInput() {
+  @PlaywrightTest
+  void shouldClearInput(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     Locator handle = page.locator("input");
     handle.fill("some value");
@@ -78,8 +78,8 @@ void shouldClearInput() {
     assertEquals("", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldFocusAndBlurAButton() {
+  @PlaywrightTest
+  void shouldFocusAndBlurAButton(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/button.html");
     Locator button = page.locator("button");
     assertEquals(false, button.evaluate("button => document.activeElement === button"));
@@ -103,8 +103,8 @@ void shouldFocusAndBlurAButton() {
     assertTrue(blurred[0]);
     assertEquals(false, button.evaluate("button => document.activeElement === button"));
   }
-  @Test
-  void LocatorLocatorAndFrameLocatorLocatorShouldAcceptLocator() {
+  @PlaywrightTest
+  void LocatorLocatorAndFrameLocatorLocatorShouldAcceptLocator(Page page) {
     page.setContent("<div><input value=outer></div>\n" +
       "    <iframe srcdoc=\"<div><input value=inner></div>\"></iframe>\n");
     Locator inputLocator = page.locator("input");
@@ -118,15 +118,15 @@ void LocatorLocatorAndFrameLocatorLocatorShouldAcceptLocator() {
     assertEquals("inner", page.frameLocator("iframe").locator(divLocator).locator("input").inputValue());
   }
 
-  @Test
-  void shouldPressSequentially() {
+  @PlaywrightTest
+  void shouldPressSequentially(Page page) {
     page.setContent("<input type='text' />");
     page.locator("input").pressSequentially("hello");
     assertEquals("hello", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  public void shouldSupportFilterVisible() {
+  @PlaywrightTest
+  public void shouldSupportFilterVisible(Page page) {
     page.setContent("<div>\n" +
       "  <div class=\"item\" style=\"display: none\">Hidden data0</div>\n" +
       "  <div class=\"item\">visible data1</div>\n" +
@@ -141,44 +141,44 @@ public void shouldSupportFilterVisible() {
     assertThat(page.locator(".item").filter(new Locator.FilterOptions().setVisible(false)).getByText("data1")).hasText("Hidden data1");
   }
 
-  @Test
-  void waitForFunctionShouldWaitForAnAttributeToAppear() {
+  @PlaywrightTest
+  void waitForFunctionShouldWaitForAnAttributeToAppear(Page page) {
     page.setContent("<button id=toggle>Menu</button>");
     page.evaluate("() => setTimeout(() => document.querySelector('#toggle').setAttribute('aria-expanded', 'true'), 500)");
     page.locator("#toggle").waitForFunction("element => element.hasAttribute('aria-expanded')");
   }
 
-  @Test
-  void waitForFunctionShouldReturnImmediatelyWhenAlreadyTruthy() {
+  @PlaywrightTest
+  void waitForFunctionShouldReturnImmediatelyWhenAlreadyTruthy(Page page) {
     page.setContent("<div id=target>yes</div>");
     page.locator("#target").waitForFunction("element => element.textContent === 'yes'");
   }
 
-  @Test
-  void waitForFunctionShouldAcceptElementHandleArguments() {
+  @PlaywrightTest
+  void waitForFunctionShouldAcceptElementHandleArguments(Page page) {
     page.setContent("<div id=a></div><div id=b>value</div>");
     ElementHandle handle = page.querySelector("#b");
     page.locator("#a").waitForFunction("(element, other) => other.textContent === 'value'", handle);
   }
 
-  @Test
-  void waitForFunctionShouldThrowWhenPredicateThrows() {
+  @PlaywrightTest
+  void waitForFunctionShouldThrowWhenPredicateThrows(Page page) {
     page.setContent("<div id=target>no</div>");
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> page.locator("#target").waitForFunction("() => { throw new Error('oh my'); }"));
     assertTrue(e.getMessage().contains("oh my"), e.getMessage());
   }
 
-  @Test
-  void waitForFunctionShouldThrowOnStrictModeViolation() {
+  @PlaywrightTest
+  void waitForFunctionShouldThrowOnStrictModeViolation(Page page) {
     page.setContent("<div class=x>1</div><div class=x>2</div>");
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> page.locator("div.x").waitForFunction("() => true"));
     assertTrue(e.getMessage().contains("strict mode violation"), e.getMessage());
   }
 
-  @Test
-  void waitForFunctionShouldRespectTimeout() {
+  @PlaywrightTest
+  void waitForFunctionShouldRespectTimeout(Page page) {
     page.setContent("<div id=target>no</div>");
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> page.locator("#target").waitForFunction("element => element.textContent === 'yes'", null,
@@ -186,8 +186,8 @@ void waitForFunctionShouldRespectTimeout() {
     assertTrue(e.getMessage().contains("Timeout 500ms exceeded"), e.getMessage());
   }
 
-  @Test
-  public void shouldSupportVisible() {
+  @PlaywrightTest
+  public void shouldSupportVisible(Page page) {
     page.setContent("<div>\n" +
       "  <div class=\"item\" style=\"display: none\">Hidden data0</div>\n" +
       "  <div class=\"item\">visible data1</div>\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestNetworkPostData.java b/playwright/src/test/java/com/microsoft/playwright/TestNetworkPostData.java
index 6c7c88cf2..b06d8299f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestNetworkPostData.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestNetworkPostData.java
@@ -17,7 +17,7 @@
 package com.microsoft.playwright;
 
 import com.google.gson.Gson;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -26,9 +26,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestNetworkPostData extends TestBase {
-  @Test
-  void shouldReturnCorrectPostDataBufferForUtf8Body() {
+public class TestNetworkPostData {
+  @PlaywrightTest
+  void shouldReturnCorrectPostDataBufferForUtf8Body(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     String value = "baẞ";
     Request request = page.waitForRequest("**", () -> {
@@ -45,8 +45,8 @@ void shouldReturnCorrectPostDataBufferForUtf8Body() {
     assertEquals(new Gson().toJson(value), request.postData());
   }
 
-  @Test
-  void shouldReturnPostDataWOContentType() {
+  @PlaywrightTest
+  void shouldReturnPostDataWOContentType(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest("**", () -> {
       page.evaluate("({url}) => {\n" +
@@ -65,8 +65,8 @@ void shouldThrowOnInvalidJSONInPostData() {
       // Thre is no postDataJSON() in java
   }
 
-  @Test
-  void shouldReturnPostDataForPUTRequests() {
+  @PlaywrightTest
+  void shouldReturnPostDataForPUTRequests(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest("**", () -> {
       page.evaluate("({url}) => {\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestNetworkRequest.java b/playwright/src/test/java/com/microsoft/playwright/TestNetworkRequest.java
index bedb76100..609e106e3 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestNetworkRequest.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestNetworkRequest.java
@@ -16,9 +16,11 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HttpHeader;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.OS;
 
 import java.io.OutputStreamWriter;
 import java.util.*;
@@ -27,11 +29,14 @@
 import java.util.stream.Collectors;
 
 import static com.microsoft.playwright.Utils.*;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestNetworkRequest extends TestBase {
-  @Test
-  void shouldWorkForMainFrameNavigationRequest() {
+public class TestNetworkRequest {
+  @PlaywrightTest
+  void shouldWorkForMainFrameNavigationRequest(Page page, Server server) {
     List<Request> requests = new ArrayList<>();
     page.onRequest(request -> requests.add(request));
     page.navigate(server.EMPTY_PAGE);
@@ -39,8 +44,8 @@ void shouldWorkForMainFrameNavigationRequest() {
     assertEquals(page.mainFrame(), requests.get(0).frame());
   }
 
-  @Test
-  void shouldWorkForSubframeNavigationRequest() {
+  @PlaywrightTest
+  void shouldWorkForSubframeNavigationRequest(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     List<Request> requests = new ArrayList<>();
     page.onRequest(request -> requests.add(request));
@@ -49,8 +54,8 @@ void shouldWorkForSubframeNavigationRequest() {
     assertEquals(page.frames().get(1), requests.get(0).frame());
   }
 
-  @Test
-  void shouldWorkForFetchRequests() {
+  @PlaywrightTest
+  void shouldWorkForFetchRequests(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     List<Request> requests = new ArrayList<>();
     page.onRequest(request -> requests.add(request));
@@ -59,8 +64,8 @@ void shouldWorkForFetchRequests() {
     assertEquals(page.mainFrame(), requests.get(0).frame());
   }
 
-  @Test
-  void shouldWorkForARedirect() {
+  @PlaywrightTest
+  void shouldWorkForARedirect(Page page, Server server) {
     server.setRedirect("/foo.html", "/empty.html");
     List<Request> requests = new ArrayList<>();
     page.onRequest(request -> requests.add(request));
@@ -71,8 +76,8 @@ void shouldWorkForARedirect() {
     assertEquals(server.PREFIX + "/empty.html", requests.get(1).url());
   }
 
-  @Test
-  void shouldWorkAllHeadersInsideRoute() {
+  @PlaywrightTest
+  void shouldWorkAllHeadersInsideRoute(Page page, Server server) {
     List<Request> requests = new ArrayList<>();
     page.route("**", route -> {
       assertTrue(route.request().allHeaders().get("accept").length() > 5);
@@ -84,8 +89,8 @@ void shouldWorkAllHeadersInsideRoute() {
   }
 
   // https://github.com/microsoft/playwright/issues/3993
-  @Test
-  void shouldNotWorkForARedirectAndInterception() {
+  @PlaywrightTest
+  void shouldNotWorkForARedirectAndInterception(Page page, Server server) {
     server.setRedirect("/foo.html", "/empty.html");
     List<Request> requests = new ArrayList<>();
     page.route("**", route -> {
@@ -100,21 +105,17 @@ void shouldNotWorkForARedirectAndInterception() {
     assertEquals(server.PREFIX + "/foo.html", requests.get(0).url());
   }
 
-  @Test
-  void shouldReturnHeaders() {
+  @PlaywrightTest
+  void shouldReturnHeaders(Page page, Server server, BrowserName browserName) {
     Response response = page.navigate(server.EMPTY_PAGE);
-    if (isChromium())
+    if (browserName == CHROMIUM)
       assertTrue(response.request().headers().get("user-agent").contains("Chrome"));
-    else if (isFirefox())
+    else if (browserName == FIREFOX)
       assertTrue(response.request().headers().get("user-agent").contains("Firefox"));
-    else if (isWebKit())
+    else if (browserName == WEBKIT)
       assertTrue(response.request().headers().get("user-agent").contains("WebKit"));
   }
 
-  static boolean isWebKitWindows() {
-    return isWebKit() && getOS() == Utils.OS.WINDOWS;
-  }
-
   // HTTP server in java does not preserve headers order.
   static List<HttpHeader> normalizeServerHeaders(Map<String,List<String>> headers) {
     List<HttpHeader> serverHeaders = new ArrayList<>();
@@ -144,8 +145,8 @@ static List<HttpHeader> normalizeAllHeaders(Map<String, String> headers) {
     return serverHeaders;
   }
 
-  static List<HttpHeader> adjustServerHeaders(List<HttpHeader> headers) {
-    if (isFirefox()) {
+  static List<HttpHeader> adjustServerHeaders(BrowserName browserName, List<HttpHeader> headers) {
+    if (browserName == FIREFOX) {
       for (Iterator<HttpHeader> it = headers.iterator(); it.hasNext(); ) {
         if ("priority".equals(it.next().name)) {
           it.remove();
@@ -155,9 +156,9 @@ static List<HttpHeader> adjustServerHeaders(List<HttpHeader> headers) {
     return headers;
   }
 
-  @Test
-  @DisabledIf(value="isWebKitWindows", disabledReason="Flaky, see https://github.com/microsoft/playwright/issues/6690")
-  void shouldGetTheSameHeadersAsTheServer() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.WINDOWS, reason = "Flaky, see https://github.com/microsoft/playwright/issues/6690")
+  void shouldGetTheSameHeadersAsTheServer(Page page, Server server, BrowserName browserName) throws ExecutionException, InterruptedException {
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
     server.setRoute("/empty.html", exchange -> {
       exchange.sendResponseHeaders(200, 0);
@@ -167,14 +168,14 @@ void shouldGetTheSameHeadersAsTheServer() throws ExecutionException, Interrupted
     });
     Response response = page.navigate(server.PREFIX + "/empty.html");
 
-    List<HttpHeader> expectedHeaders = adjustServerHeaders(normalizeServerHeaders(serverRequest.get().headers));
+    List<HttpHeader> expectedHeaders = adjustServerHeaders(browserName, normalizeServerHeaders(serverRequest.get().headers));
     List<HttpHeader> allHeaders = normalizeAllHeaders(response.request().allHeaders());
     assertJsonEquals(expectedHeaders, allHeaders);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="fail")
-  void shouldGetTheSameHeadersAsTheServerCORP() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "fail")
+  void shouldGetTheSameHeadersAsTheServerCORP(Page page, Server server, BrowserName browserName) throws ExecutionException, InterruptedException {
     page.navigate(server.PREFIX + "/empty.html");
     Future<Server.Request> serverRequest = server.futureRequest("/something");
     server.setRoute("/something", exchange -> {
@@ -191,13 +192,13 @@ void shouldGetTheSameHeadersAsTheServerCORP() throws ExecutionException, Interru
           "}", server.CROSS_PROCESS_PREFIX + "/something");
         assertEquals("done", text);
       });
-    List<HttpHeader> expectedHeaders = adjustServerHeaders(normalizeServerHeaders(serverRequest.get().headers));
+    List<HttpHeader> expectedHeaders = adjustServerHeaders(browserName, normalizeServerHeaders(serverRequest.get().headers));
     List<HttpHeader> allHeaders = normalizeAllHeaders(response.request().allHeaders());
     assertJsonEquals(expectedHeaders, allHeaders);
   }
 
-  @Test
-  void shouldReturnPostData() {
+  @PlaywrightTest
+  void shouldReturnPostData(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRoute("/post", exchange -> {
       exchange.sendResponseHeaders(200, 0);
@@ -210,8 +211,8 @@ void shouldReturnPostData() {
     assertEquals("{\"foo\":\"bar\"}", request[0].postData());
   }
 
-  @Test
-  void shouldWorkWithBinaryPostData() {
+  @PlaywrightTest
+  void shouldWorkWithBinaryPostData(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRoute("/post", exchange -> {
       exchange.sendResponseHeaders(200, 0);
@@ -230,8 +231,8 @@ void shouldWorkWithBinaryPostData() {
     }
   }
 
-  @Test
-  void shouldWorkWithBinaryPostDataAndInterception() {
+  @PlaywrightTest
+  void shouldWorkWithBinaryPostDataAndInterception(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRoute("/post", exchange -> {
       exchange.sendResponseHeaders(200, 0);
@@ -251,8 +252,8 @@ void shouldWorkWithBinaryPostDataAndInterception() {
     }
   }
 
-  @Test
-  void shouldBeUndefinedWhenThereIsNoPostData() {
+  @PlaywrightTest
+  void shouldBeUndefinedWhenThereIsNoPostData(Page page, Server server) {
     Response response = page.navigate(server.EMPTY_PAGE);
     assertNull(response.request().postData());
   }
@@ -265,8 +266,8 @@ void shouldParseTheDataIfContentTypeIsApplicationXWwwFormUrlencoded() {
     // Not supported in Java.
   }
 
-  @Test
-  void shouldReturnEventSource() {
+  @PlaywrightTest
+  void shouldReturnEventSource(Page page, Server server) {
     // 1. Setup server-sent events on server that immediately sends a message to the client.
     server.setRoute("/sse", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "text/event-stream");
@@ -292,8 +293,8 @@ void shouldReturnEventSource() {
     assertEquals("eventsource", requests.get(0).resourceType());
   }
 
-  @Test
-  void shouldReturnNavigationBit() {
+  @PlaywrightTest
+  void shouldReturnNavigationBit(Page page, Server server) {
     Map<String, Request> requests = new HashMap<>();
     page.onRequest(request -> {
       String name = request.url();
@@ -312,8 +313,8 @@ void shouldReturnNavigationBit() {
     assertFalse(requests.get("style.css").isNavigationRequest());
   }
 
-  @Test
-  void shouldReturnNavigationBitWhenNavigatingToImage() {
+  @PlaywrightTest
+  void shouldReturnNavigationBitWhenNavigatingToImage(Page page, Server server) {
     List<Request> requests = new ArrayList<>();
     page.onRequest(request -> requests.add(request));
     page.navigate(server.PREFIX + "/pptr.png");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestNetworkResponse.java b/playwright/src/test/java/com/microsoft/playwright/TestNetworkResponse.java
index 1dc08d16a..150d716cb 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestNetworkResponse.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestNetworkResponse.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.ServerAddr;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -30,9 +30,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestNetworkResponse extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestNetworkResponse {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().add("foo", "bar");
       exchange.getResponseHeaders().add("BaZ", "bAz");
@@ -45,22 +45,22 @@ void shouldWork() {
     assertNull(response.headers().get("BaZ"));
   }
 
-  @Test
-  void shouldReturnText() {
+  @PlaywrightTest
+  void shouldReturnText(Page page, Server server) {
     Response response = page.navigate(server.PREFIX + "/simple.json");
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void shouldReturnUncompressedText() {
+  @PlaywrightTest
+  void shouldReturnUncompressedText(Page page, Server server) {
     server.enableGzip("/simple.json");
     Response response = page.navigate(server.PREFIX + "/simple.json");
     assertEquals("gzip", response.headers().get("content-encoding"));
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void shouldThrowWhenRequestingBodyOfRedirectedResponse() {
+  @PlaywrightTest
+  void shouldThrowWhenRequestingBodyOfRedirectedResponse(Page page, Server server) {
     server.setRedirect("/foo.html", "/empty.html");
     Response response = page.navigate(server.PREFIX + "/foo.html");
     Request redirectedFrom = response.request().redirectedFrom();
@@ -71,8 +71,8 @@ void shouldThrowWhenRequestingBodyOfRedirectedResponse() {
     assertTrue(e.getMessage().contains("Response body is unavailable for redirect responses"));
   }
 
-  @Test
-  void shouldWaitUntilResponseCompletes() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldWaitUntilResponseCompletes(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     Semaphore responseWritten = new Semaphore(0);
     Semaphore responseRead = new Semaphore(0);
@@ -115,23 +115,23 @@ void shouldWaitUntilResponseCompletes() throws ExecutionException, InterruptedEx
   void shouldReturnJson() {
     // Not exposed in Java.
   }
-  @Test
-  void shouldReturnBody() throws IOException {
+  @PlaywrightTest
+  void shouldReturnBody(Page page, Server server) throws IOException {
     Response response = page.navigate(server.PREFIX + "/pptr.png");
     byte[] expected = Files.readAllBytes(Paths.get("src/test/resources/pptr.png"));
     assertTrue(Arrays.equals(expected, response.body()));
   }
 
-  @Test
-  void shouldReturnBodyWithCompression() throws IOException {
+  @PlaywrightTest
+  void shouldReturnBodyWithCompression(Page page, Server server) throws IOException {
     server.enableGzip("/pptr.png");
     Response response = page.navigate(server.PREFIX + "/pptr.png");
     byte[] expected = Files.readAllBytes(Paths.get("src/test/resources/pptr.png"));
     assertTrue(Arrays.equals(expected, response.body()));
   }
 
-  @Test
-  void shouldReturnStatusText() {
+  @PlaywrightTest
+  void shouldReturnStatusText(Page page, Server server) {
     server.setRoute("/cool", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       exchange.getResponseBody().close();
@@ -140,8 +140,8 @@ void shouldReturnStatusText() {
     assertEquals("OK", response.statusText());
   }
 
-  @Test
-  void shouldReturnServerAddress() {
+  @PlaywrightTest
+  void shouldReturnServerAddress(Page page, Server server) {
     Response response = page.navigate(server.EMPTY_PAGE);
     ServerAddr address = response.serverAddr();
     assertNotNull(address);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestOptionsFactories.java b/playwright/src/test/java/com/microsoft/playwright/TestOptionsFactories.java
deleted file mode 100644
index ce28fa3fa..000000000
--- a/playwright/src/test/java/com/microsoft/playwright/TestOptionsFactories.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.microsoft.playwright;
-
-import com.microsoft.playwright.junit.Options;
-import com.microsoft.playwright.junit.OptionsFactory;
-
-public class TestOptionsFactories {
-
-  public static class BasicOptionsFactory implements OptionsFactory {
-    @Override
-    public Options getOptions() {
-      return new Options().setBrowserName(getBrowserName());
-    }
-  }
-
-  public static String getBrowserChannelFromEnv() {
-    return System.getenv("BROWSER_CHANNEL");
-  }
-
-  public static BrowserType.LaunchOptions createLaunchOptions() {
-    BrowserType.LaunchOptions options;
-    options = new BrowserType.LaunchOptions();
-    options.headless = !getHeaded();
-    return options;
-  }
-
-  private static boolean getHeaded() {
-    String headedEnv = System.getenv("HEADED");
-    return headedEnv != null && !"0".equals(headedEnv) && !"false".equals(headedEnv);
-  }
-
-  public static String getBrowserName() {
-    String browserName = System.getenv("BROWSER");
-    if (browserName == null) {
-      browserName = "chromium";
-    }
-    return browserName;
-  }
-
-  public static boolean isChromium() {
-    return getBrowserName().equals("chromium");
-  }
-
-  public static boolean isFirefox() {
-    return getBrowserName().equals("firefox");
-  }
-
-  public static boolean isWebKit() {
-    return getBrowserName().equals("webkit");
-  }
-
-  static final boolean isMac = Utils.getOS() == Utils.OS.MAC;
-  static final boolean isWindows = Utils.getOS() == Utils.OS.WINDOWS;
-}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAddLocatorHandler.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAddLocatorHandler.java
index 5b5cab3e2..0de92caaf 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAddLocatorHandler.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAddLocatorHandler.java
@@ -16,16 +16,16 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
 import com.microsoft.playwright.options.WaitForSelectorState;
-import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageAddLocatorHandler extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageAddLocatorHandler {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
     int[] beforeCount = {0};
@@ -73,8 +73,8 @@ void shouldWork() {
     }
   }
 
-  @Test
-  void shouldWorkWithCustomCheck() {
+  @PlaywrightTest
+  void shouldWorkWithCustomCheck(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
     page.addLocatorHandler(page.locator("body"), locator -> {
@@ -103,8 +103,8 @@ void shouldWorkWithCustomCheck() {
     }
   }
 
-  @Test
-  void shouldWorkWithLocatorHover() {
+  @PlaywrightTest
+  void shouldWorkWithLocatorHover(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
     page.addLocatorHandler(page.getByText("This interstitial covers the button"), locator -> {
@@ -120,8 +120,8 @@ void shouldWorkWithLocatorHover() {
     assertEquals("rgb(255, 255, 0)", page.evalOnSelector("#target", "element => getComputedStyle(element).backgroundColor"));
   }
 
-  @Test
-  void shouldNotWorkWithForceTrue() {
+  @PlaywrightTest
+  void shouldNotWorkWithForceTrue(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
     page.addLocatorHandler(page.getByText("This interstitial covers the button"), locator -> {
@@ -138,8 +138,8 @@ void shouldNotWorkWithForceTrue() {
     assertNull(page.evaluate("window.clicked"));
   }
 
-  @Test
-  void shouldThrowWhenPageCloses() {
+  @PlaywrightTest
+  void shouldThrowWhenPageCloses(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
     page.addLocatorHandler(page.getByText("This interstitial covers the button"), locator -> {
@@ -155,8 +155,8 @@ void shouldThrowWhenPageCloses() {
     assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
-  void shouldWorkWithToBeVisible() {
+  @PlaywrightTest
+  void shouldWorkWithToBeVisible(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
     int[] called = {0};
@@ -174,8 +174,8 @@ void shouldWorkWithToBeVisible() {
     assertEquals(1, called[0]);
  }
 
-  @Test
-  public void shouldWorkWhenOwnerFrameDetaches() {
+  @PlaywrightTest
+  public void shouldWorkWhenOwnerFrameDetaches(Browser browser, Server server) {
     Page page = browser.newPage();
     page.navigate(server.EMPTY_PAGE);
 
@@ -206,8 +206,8 @@ public void shouldWorkWhenOwnerFrameDetaches() {
     assertTrue((Boolean) page.evaluate("window._clicked"));
   }
 
-  @Test
-  public void shouldWorkWithTimesOption() {
+  @PlaywrightTest
+  public void shouldWorkWithTimesOption(Browser browser, Server server) {
     Page page = browser.newPage();
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
@@ -230,8 +230,8 @@ public void shouldWorkWithTimesOption() {
     assertTrue(e.getMessage().contains("<div>This interstitial covers the button</div> from <div class=\"visible\" id=\"interstitial\">…</div> subtree intercepts pointer events"), e.getMessage());
   }
 
-  @Test
-  public void shouldWaitForHiddenByDefault() {
+  @PlaywrightTest
+  public void shouldWaitForHiddenByDefault(Browser browser, Server server) {
     Page page = browser.newPage();
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
@@ -253,8 +253,8 @@ public void shouldWaitForHiddenByDefault() {
     assertEquals(1, called[0]);
   }
 
-  @Test
-  public void shouldWaitForHiddenByDefault2() {
+  @PlaywrightTest
+  public void shouldWaitForHiddenByDefault2(Browser browser, Server server) {
     Page page = browser.newPage();
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
@@ -276,8 +276,8 @@ public void shouldWaitForHiddenByDefault2() {
     assertTrue(e.getMessage().contains("locator handler has finished, waiting for getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName(\"close\")) to be hidden"), e.getMessage());
   }
 
-  @Test
-  public void shouldWorkWithNoWaitAfter() {
+  @PlaywrightTest
+  public void shouldWorkWithNoWaitAfter(Browser browser, Server server) {
     Page page = browser.newPage();
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
@@ -303,8 +303,8 @@ public void shouldWorkWithNoWaitAfter() {
     assertEquals(2, called[0]);
   }
 
-  @Test
-  public void shouldRemoveLocatorHandler() {
+  @PlaywrightTest
+  public void shouldRemoveLocatorHandler(Browser browser, Server server) {
     Page page = browser.newPage();
     page.navigate(server.PREFIX + "/input/handle-locator.html");
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAddScriptTag.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAddScriptTag.java
index 385b33fe7..1afee45d9 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAddScriptTag.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAddScriptTag.java
@@ -16,19 +16,20 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestPageAddScriptTag extends TestBase {
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="Upstream behavior")
-  void shouldIncludeSourceURLWhenPathIsProvided() {
+public class TestPageAddScriptTag {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "Upstream behavior")
+  void shouldIncludeSourceURLWhenPathIsProvided(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Path path = Paths.get("src/test/resources/injectedfile.js");
     page.addScriptTag(new Page.AddScriptTagOptions().setPath(path));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java
index 442f2cd01..a41cce6a0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshot.java
@@ -1,8 +1,6 @@
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.opentest4j.AssertionFailedError;
 
 import java.util.Arrays;
@@ -15,8 +13,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@FixtureTest
-@UsePlaywright
 public class TestPageAriaSnapshot {
   public static String unshift(String snapshot) {
     List<String> lines = Arrays.asList(snapshot.split("\n"));
@@ -46,13 +42,13 @@ private static void checkAndMatchSnapshot(Locator locator, String snapshot) {
     assertThat(locator).matchesAriaSnapshot(snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshot(Page page) {
     page.setContent("<h1>title</h1>");
     checkAndMatchSnapshot(page.locator("body"), "- heading \"title\" [level=1]");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotList(Page page) {
     page.setContent("<h1>title</h1><h1>title 2</h1>");
     checkAndMatchSnapshot(page.locator("body"), "" +
@@ -60,19 +56,19 @@ void shouldSnapshotList(Page page) {
       "  - heading \"title 2\" [level=1]");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotListWithAccessibleName(Page page) {
     page.setContent("<ul aria-label=\"my list\"><li>one</li><li>two</li></ul>");
     checkAndMatchSnapshot(page.locator("body"), "- list \"my list\":\n  - listitem: one\n  - listitem: two");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotComplex(Page page) {
     page.setContent("<ul><li><a href='about:blank'>link</a></li></ul>");
     checkAndMatchSnapshot(page.locator("body"), "- list:\n  - listitem:\n    - link \"link\":\n      - /url: about:blank");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldAllowTextNodes(Page page) {
     page.setContent("<h1>Microsoft</h1><div>Open source projects and samples from Microsoft</div>");
     checkAndMatchSnapshot(page.locator("body"), "" +
@@ -80,13 +76,13 @@ void shouldAllowTextNodes(Page page) {
       "    - text: Open source projects and samples from Microsoft");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotDetailsVisibility(Page page) {
     page.setContent("<details><summary>Summary</summary><div>Details</div></details>");
     checkAndMatchSnapshot(page.locator("body"), "- group: Summary");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotChildren(Page page) {
     page.setContent("<ul><li><img />One</li><li>Two</li><li>Three</li></ul>");
     assertThat(page.locator("body")).matchesAriaSnapshot("- list:\n  - /children: equal\n  - listitem\n  - listitem: Two\n  - listitem: Three");
@@ -97,7 +93,7 @@ void shouldSnapshotChildren(Page page) {
     assertThat(page.locator("body")).matchesAriaSnapshot("- list:\n  - /children: deep-equal\n  - listitem:\n    - /children: contain\n    - text: One\n  - listitem: Two\n  - listitem: Three");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldMatchUrl(Page page) {
     page.setContent("<a href='https://example.com'>Link</a>");
     assertThat(page.locator("body")).matchesAriaSnapshot("" +
@@ -105,7 +101,7 @@ void shouldMatchUrl(Page page) {
       "  - /url: /.*example.com/");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldHandleTopLevelDeepEqual(Page page) {
     // https://github.com/microsoft/playwright/issues/36456
     page.setContent("" +
@@ -128,7 +124,7 @@ void shouldHandleTopLevelDeepEqual(Page page) {
     });
   }
 
-  @Test
+  @PlaywrightTest
   void matchValuesBothAgainstRegexAndString(Page page) {
     page.setContent("<a href=\"/auth?r=/\">Log in</a>");
     checkAndMatchSnapshot(page.locator("body"),
@@ -136,7 +132,7 @@ void matchValuesBothAgainstRegexAndString(Page page) {
       "  - /url: /auth?r=/");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotIntegration(Page page) {
     page.setContent(
       "<h1>Microsoft</h1>" +
@@ -160,7 +156,7 @@ void shouldSnapshotIntegration(Page page) {
       "      - /url: about:blank");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSupportMultilineText(Page page) {
     page.setContent("<p>\n      Line 1\n      Line 2\n      Line 3\n    </p>");
     checkAndMatchSnapshot(page.locator("body"), "- paragraph: Line 1 Line 2 Line 3");
@@ -171,25 +167,25 @@ void shouldSupportMultilineText(Page page) {
       "        Line 3");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldConcatenateSpanText(Page page) {
     page.setContent("<span>One</span> <span>Two</span> <span>Three</span>");
     checkAndMatchSnapshot(page.locator("body"), "- text: One Two Three");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldConcatenateSpanText2(Page page) {
     page.setContent("<span>One </span><span>Two </span><span>Three</span>");
     checkAndMatchSnapshot(page.locator("body"), "- text: One Two Three");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldConcatenateDivTextWithSpaces(Page page) {
     page.setContent("<div>One</div><div>Two</div><div>Three</div>");
     checkAndMatchSnapshot(page.locator("body"), "- text: One Two Three");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIncludePseudoInText(Page page) {
     page.setContent(
       "<style>span:before { content: 'world'; } div:after { content: 'bye'; }</style>" +
@@ -199,7 +195,7 @@ void shouldIncludePseudoInText(Page page) {
       "  - /url: about:blank");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotIncludeHiddenPseudoInText(Page page) {
     page.setContent(
       "<style>span:before { content: 'world'; display: none; } div:after { content: 'bye'; visibility: hidden; }</style>" +
@@ -209,7 +205,7 @@ void shouldNotIncludeHiddenPseudoInText(Page page) {
       "  - /url: about:blank");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIncludeNewLineForBlockPseudo(Page page) {
     page.setContent(
       "<style>span:before { content: 'world'; display: block; } div:after { content: 'bye'; display: block; }</style>" +
@@ -219,7 +215,7 @@ void shouldIncludeNewLineForBlockPseudo(Page page) {
       "  - /url: about:blank");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldWorkWithSlots(Page page) {
     // Text "foo" is assigned to the slot, should not be used twice.
     page.setContent(
@@ -265,7 +261,7 @@ void shouldWorkWithSlots(Page page) {
     checkAndMatchSnapshot(page.locator("body"), "- button \"pre\"");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotInnerText(Page page) {
     page.setContent(
       "<div role=\"listitem\"><div><div><span title=\"a.test.ts\">a.test.ts</span></div>" +
@@ -286,25 +282,25 @@ void shouldSnapshotInnerText(Page page) {
       "      - button \"Watch\"");
   }
 
-  @Test
+  @PlaywrightTest
   void checkAriaHiddenText(Page page) {
     page.setContent("<p><span>hello</span><span aria-hidden=\"true\">world</span></p>");
     checkAndMatchSnapshot(page.locator("body"), "- paragraph: hello");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIgnorePresentationAndNoneRoles(Page page) {
     page.setContent("<ul><li role=\"presentation\">hello</li><li role=\"none\">world</li></ul>");
     checkAndMatchSnapshot(page.locator("body"), "- list: hello world");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotUseOnAsCheckboxValue(Page page) {
     page.setContent("<input type=\"checkbox\"><input type=\"radio\">");
     checkAndMatchSnapshot(page.locator("body"), "- checkbox\n- radio");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotReportTextareaTextContent(Page page) {
     page.setContent("<textarea>Before</textarea>");
     checkAndMatchSnapshot(page.locator("body"), "- textbox: Before");
@@ -312,7 +308,7 @@ void shouldNotReportTextareaTextContent(Page page) {
     checkAndMatchSnapshot(page.locator("body"), "- textbox: After");
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotShowVisibleChildrenOfHiddenElements(Page page) {
     page.setContent(
       "<div style=\"visibility: hidden;\">" +
@@ -321,7 +317,7 @@ void shouldNotShowVisibleChildrenOfHiddenElements(Page page) {
     assertEquals("", page.locator("body").ariaSnapshot());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotShowUnhiddenChildrenOfAriaHiddenElements(Page page) {
     page.setContent(
       "<div aria-hidden=\"true\">" +
@@ -330,7 +326,7 @@ void shouldNotShowUnhiddenChildrenOfAriaHiddenElements(Page page) {
     assertEquals("", page.locator("body").ariaSnapshot());
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotPlaceholderWhenDifferentFromName(Page page) {
     page.setContent("<input placeholder=\"Placeholder\">");
     assertThat(page.locator("body")).matchesAriaSnapshot("- textbox \"Placeholder\"");
@@ -341,7 +337,7 @@ void shouldSnapshotPlaceholderWhenDifferentFromName(Page page) {
       "  - /placeholder: Placeholder");
   }
 
-  @Test
+  @PlaywrightTest
   void pageMatchesAriaSnapshot(Page page) {
     page.setContent("<h1>hello</h1>");
     assertThat(page).matchesAriaSnapshot("- heading \"hello\" [level=1]");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java
index 233ba61e3..245ffee86 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAriaSnapshotAI.java
@@ -1,21 +1,17 @@
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaSnapshotMode;
-import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright
 public class TestPageAriaSnapshotAI {
   private static String aiSnapshot(Page page) {
     return page.ariaSnapshot(new Page.AriaSnapshotOptions().setMode(AriaSnapshotMode.AI));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldGenerateRefs(Page page) {
     page.setContent("<button>One</button><button>Two</button><button>Three</button>");
 
@@ -35,7 +31,7 @@ void shouldGenerateRefs(Page page) {
     assertTrue(snapshot2.contains("button \"Three\" [ref=e4]"), snapshot2);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldListIframes(Page page) {
     page.setContent(
       "<h1>Hello</h1>" +
@@ -48,7 +44,7 @@ void shouldListIframes(Page page) {
     assertEquals("- heading \"World\" [level=1]", frameSnapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSnapshotLocatorInsideIframe(Page page) {
     page.setContent(
       "<h1>Main Page</h1>" +
@@ -61,21 +57,21 @@ void shouldSnapshotLocatorInsideIframe(Page page) {
     assertTrue(snapshot.contains("listitem [ref=f1e3]: Item 2"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldCollapseGenericNodes(Page page) {
     page.setContent("<div><div><div><button>Button</button></div></div></div>");
     String snapshot = aiSnapshot(page);
     assertTrue(snapshot.contains("button \"Button\" [ref=e5]"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIncludeCursorPointerHint(Page page) {
     page.setContent("<button style=\"cursor: pointer\">Button</button>");
     String snapshot = aiSnapshot(page);
     assertTrue(snapshot.contains("button \"Button\" [ref=e2] [cursor=pointer]"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotNestCursorPointerHints(Page page) {
     page.setContent(
       "<a style=\"cursor: pointer\" href=\"about:blank\">" +
@@ -91,7 +87,7 @@ void shouldNotNestCursorPointerHints(Page page) {
     assertFalse(snapshot.contains("button \"Button\" [ref=e3] [cursor=pointer]"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldShowVisibleChildrenOfHiddenElements(Page page) {
     page.setContent(
       "<div style=\"visibility: hidden\">" +
@@ -110,7 +106,7 @@ void shouldShowVisibleChildrenOfHiddenElements(Page page) {
       snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldIncludeActiveElementInformation(Page page) {
     page.setContent(
       "<button id=\"btn1\">Button 1</button>" +
@@ -123,7 +119,7 @@ void shouldIncludeActiveElementInformation(Page page) {
     assertFalse(snapshot.contains("button \"Button 1\" [active]"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldUpdateActiveElementOnFocus(Page page) {
     page.setContent(
       "<input id=\"input1\" placeholder=\"First input\">" +
@@ -142,7 +138,7 @@ void shouldUpdateActiveElementOnFocus(Page page) {
     assertFalse(afterFocusSnapshot.contains("textbox \"First input\" [active]"), afterFocusSnapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldCollapseInlineGenericNodes(Page page) {
     page.setContent(
       "<ul>" +
@@ -156,14 +152,14 @@ void shouldCollapseInlineGenericNodes(Page page) {
     assertTrue(snapshot.contains("listitem [ref=e5]: 1,200 sqft"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotRemoveGenericNodesWithTitle(Page page) {
     page.setContent("<div title=\"Element title\">Element content</div>");
     String snapshot = aiSnapshot(page);
     assertTrue(snapshot.contains("generic \"Element title\" [ref=e2]"), snapshot);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldLimitDepth(Page page) {
     page.setContent(
       "<ul>" +
@@ -192,7 +188,7 @@ void shouldLimitDepth(Page page) {
     assertFalse(snapshot4.contains("item3"), snapshot4);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNormalizeRefLocatorToLocatorCode(Page page) {
     page.setContent("<button>Submit</button>");
     String snapshot = aiSnapshot(page);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAssertions.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAssertions.java
index 6dea21ab4..786e44196 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAssertions.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAssertions.java
@@ -17,7 +17,7 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.PageAssertions;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.opentest4j.AssertionFailedError;
 
 import java.util.regex.Pattern;
@@ -25,15 +25,15 @@
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageAssertions extends TestBase {
-  @Test
-  void hasURLTextPass() {
+public class TestPageAssertions {
+  @PlaywrightTest
+  void hasURLTextPass(Page page) {
     page.navigate("data:text/html,<div>A</div>");
     assertThat(page).hasURL("data:text/html,<div>A</div>");
   }
 
-  @Test
-  void hasURLTextFail() {
+  @PlaywrightTest
+  void hasURLTextFail(Page page) {
     page.navigate("data:text/html,<div>B</div>");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
       assertThat(page).hasURL("foo", new PageAssertions.HasURLOptions().setTimeout(1_000));
@@ -43,8 +43,8 @@ void hasURLTextFail() {
     assertTrue(e.getMessage().contains("Page URL expected to be"), e.getMessage());
   }
 
-  @Test
-  void shouldSupportHasUrlWithBaseUrl() {
+  @PlaywrightTest
+  void shouldSupportHasUrlWithBaseUrl(Browser browser, Server server) {
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setBaseURL(server.PREFIX))) {
       Page page = context.newPage();
       page.navigate(server.EMPTY_PAGE);
@@ -52,26 +52,26 @@ void shouldSupportHasUrlWithBaseUrl() {
     }
   }
 
-  @Test
-  void notHasUrlText() {
+  @PlaywrightTest
+  void notHasUrlText(Page page) {
     page.navigate("data:text/html,<div>B</div>");
     assertThat(page).not().hasURL("about:blank", new PageAssertions.HasURLOptions().setTimeout(1000));
   }
 
-  @Test
-  public void hasUrlSupportIgnoreCase() {
+  @PlaywrightTest
+  public void hasUrlSupportIgnoreCase(Page page) {
     page.navigate("data:text/html,<div>A</div>");
     assertThat(page).hasURL("DATA:teXT/HTml,<div>a</div>", new PageAssertions.HasURLOptions().setIgnoreCase(true));
   }
 
-  @Test
-  void hasURLRegexPass() {
+  @PlaywrightTest
+  void hasURLRegexPass(Page page) {
     page.navigate("data:text/html,<div>A</div>");
     assertThat(page).hasURL(Pattern.compile("text"));
   }
 
-  @Test
-  void hasURLRegexFail() {
+  @PlaywrightTest
+  void hasURLRegexFail(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
       assertThat(page).hasURL(Pattern.compile(".*foo.*"), new PageAssertions.HasURLOptions().setTimeout(1_000));
@@ -81,26 +81,26 @@ void hasURLRegexFail() {
     assertTrue(e.getMessage().contains("Page URL expected to match regex"), e.getMessage());
   }
 
-  @Test
-  void notHasUrlRegEx() {
+  @PlaywrightTest
+  void notHasUrlRegEx(Page page) {
     page.navigate("data:text/html,<div>B</div>");
     assertThat(page).not().hasURL(Pattern.compile("about"), new PageAssertions.HasURLOptions().setTimeout(1000));
   }
 
-  @Test
-  void hasTitleTextPass() {
+  @PlaywrightTest
+  void hasTitleTextPass(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     assertThat(page).hasTitle("Woof-Woof", new PageAssertions.HasTitleOptions().setTimeout(1_000));
   }
 
-  @Test
-  void hasTitleTextNormalizeWhitespaces() {
+  @PlaywrightTest
+  void hasTitleTextNormalizeWhitespaces(Page page) {
     page.setContent("<title>     Foo     Bar    </title>");
     assertThat(page).hasTitle("  Foo  Bar", new PageAssertions.HasTitleOptions().setTimeout(1_000));
   }
 
-  @Test
-  void hasTitleTextFail() {
+  @PlaywrightTest
+  void hasTitleTextFail(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
       assertThat(page).hasTitle("foo", new PageAssertions.HasTitleOptions().setTimeout(1_000));
@@ -110,14 +110,14 @@ void hasTitleTextFail() {
     assertTrue(e.getMessage().contains("Page title expected to be\nExpected: foo\nReceived: Woof-Woof"), e.getMessage());
   }
 
-  @Test
-  void hasTitleRegexPass() {
+  @PlaywrightTest
+  void hasTitleRegexPass(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     assertThat(page).hasTitle(Pattern.compile("^.oof.+oof$"));
   }
 
-  @Test
-  void hasTitleRegexFail() {
+  @PlaywrightTest
+  void hasTitleRegexFail(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     AssertionFailedError e = assertThrows(AssertionFailedError.class, () -> {
       assertThat(page).hasTitle(Pattern.compile("^foo[AB]"), new PageAssertions.HasTitleOptions().setTimeout(1_000));
@@ -127,14 +127,14 @@ void hasTitleRegexFail() {
     assertTrue(e.getMessage().contains("Page title expected to match regex\nExpected: ^foo[AB]\nReceived: Woof-Woof"), e.getMessage());
   }
 
-  @Test
-  void notHasTitleRegEx() {
+  @PlaywrightTest
+  void notHasTitleRegEx(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     assertThat(page).not().hasTitle(Pattern.compile("ab.ut"));
   }
 
-  @Test
-  void hasTitleRegExCaseInsensitivePass() {
+  @PlaywrightTest
+  void hasTitleRegExCaseInsensitivePass(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     assertThat(page).hasTitle(Pattern.compile("woof-woof", Pattern.CASE_INSENSITIVE));
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAutowaitingBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAutowaitingBasic.java
index 748813f62..937418ea3 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageAutowaitingBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageAutowaitingBasic.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.LoadState;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
@@ -26,23 +26,23 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageAutowaitingBasic extends TestBase {
-  @Test
-  void shouldWorkWithNoWaitAfterTrue() {
+public class TestPageAutowaitingBasic {
+  @PlaywrightTest
+  void shouldWorkWithNoWaitAfterTrue(Page page, Server server) {
     server.setRoute("/empty.html", exchange -> {});
     page.setContent("<a id='anchor' href='${server.EMPTY_PAGE}'>empty.html</a>");
     page.click("a", new Page.ClickOptions().setNoWaitAfter(true));
   }
 
-  @Test
-  void shouldWorkWithDblclickNoWaitAfterTrue() {
+  @PlaywrightTest
+  void shouldWorkWithDblclickNoWaitAfterTrue(Page page, Server server) {
     server.setRoute("/empty.html", exchange -> {});
     page.setContent("<a id='anchor' href='${server.EMPTY_PAGE}'>empty.html</a>");
     page.dblclick("a", new Page.DblclickOptions().setNoWaitAfter(true));
   }
 
-  @Test
-  void shouldWorkWithWaitForLoadStateLoad() {
+  @PlaywrightTest
+  void shouldWorkWithWaitForLoadStateLoad(Page page, Server server) {
     List<String> messages = new ArrayList<>();
     server.setRoute("/empty.html", exchange -> {
       messages.add("route");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
index e9c1fa7b2..daec53e3c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
@@ -16,9 +16,10 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,16 +27,19 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.options.LoadState.LOAD;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
 @Tag("smoke")
-public class TestPageBasic extends TestBase {
+public class TestPageBasic {
 
-  @Test
-  void shouldRejectAllPromisesWhenPageIsClosed() {
+  @PlaywrightTest
+  void shouldRejectAllPromisesWhenPageIsClosed(BrowserContext context) {
     Page newPage = context.newPage();
     newPage.close();
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -44,16 +48,16 @@ void shouldRejectAllPromisesWhenPageIsClosed() {
     assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
-  void shouldNotBeVisibleInContextPages() {
+  @PlaywrightTest
+  void shouldNotBeVisibleInContextPages(BrowserContext context) {
     Page newPage = context.newPage();
     assertTrue(context.pages().contains(newPage));
     newPage.close();
     assertFalse(context.pages().contains(newPage));
   }
 
-  @Test
-  void shouldRunBeforeunloadIfAskedFor() {
+  @PlaywrightTest
+  void shouldRunBeforeunloadIfAskedFor(Page page, BrowserContext context, Server server, BrowserName browserName) {
     Page newPage = context.newPage();
     newPage.navigate(server.PREFIX + "/beforeunload.html");
     // We have to interact with a page so that "beforeunload" handlers
@@ -64,11 +68,11 @@ void shouldRunBeforeunloadIfAskedFor() {
       didShowDialog[0] = true;
       assertEquals("beforeunload", dialog.type());
       assertEquals("", dialog.defaultValue());
-      if (isChromium()) {
+      if (browserName == CHROMIUM) {
         assertEquals("", dialog.message());
-      } else if (isWebKit()) {
+      } else if (browserName == WEBKIT) {
         assertEquals("Leave?", dialog.message());
-      } else if (isChromium()) {
+      } else if (browserName == CHROMIUM) {
         assertEquals("This page is asking you to confirm that you want to leave - data you have entered may not be saved.", dialog.message());
       } else {
         assertEquals("This page is asking you to confirm that you want to leave — information you’ve entered may not be saved.", dialog.message());
@@ -85,8 +89,8 @@ void shouldRunBeforeunloadIfAskedFor() {
     assertTrue(didShowDialog[0]);
   }
 
-  @Test
-  void shouldNotRunBeforeunloadByDefault() {
+  @PlaywrightTest
+  void shouldNotRunBeforeunloadByDefault(BrowserContext context, Server server) {
     Page newPage = context.newPage();
     newPage.navigate(server.PREFIX + "/beforeunload.html");
     // We have to interact with a page so that "beforeunload" handlers
@@ -98,16 +102,16 @@ void shouldNotRunBeforeunloadByDefault() {
     assertFalse(didShowDialog[0]);
   }
 
-  @Test
-  void shouldSetThePageCloseState() {
+  @PlaywrightTest
+  void shouldSetThePageCloseState(BrowserContext context) {
     Page newPage = context.newPage();
     assertEquals(false, newPage.isClosed());
     newPage.close();
     assertEquals(true, newPage.isClosed());
   }
 
-  @Test
-  void shouldTerminateNetworkWaiters() {
+  @PlaywrightTest
+  void shouldTerminateNetworkWaiters(BrowserContext context, Server server) {
     Page newPage = context.newPage();
     PlaywrightException e1 = assertThrows(PlaywrightException.class, () -> {
       newPage.waitForResponse("**", () -> {
@@ -122,16 +126,16 @@ void shouldTerminateNetworkWaiters() {
     assertFalse(e1.getMessage().contains("Timeout"), e1.getMessage());
   }
 
-  @Test
-  void shouldBeCallableTwice() {
+  @PlaywrightTest
+  void shouldBeCallableTwice(BrowserContext context) {
     Page newPage = context.newPage();
     newPage.close();
     newPage.close();
     newPage.close();
   }
 
-  @Test
-  void shouldFireLoadWhenExpected() {
+  @PlaywrightTest
+  void shouldFireLoadWhenExpected(Page page) {
     page.navigate("about:blank");
     page.waitForLoadState(LOAD);
   }
@@ -140,29 +144,29 @@ void shouldFireLoadWhenExpected() {
   void asyncStacksShouldWork() {
   }
 
-  @Test
-  void shouldProvideAccessToTheOpenerPage() {
+  @PlaywrightTest
+  void shouldProvideAccessToTheOpenerPage(Page page) {
     Page popup = page.waitForPopup(() -> page.evaluate("() => window.open('about:blank')"));
     Page opener = popup.opener();
     assertEquals(page, opener);
   }
 
-  @Test
-  void shouldReturnNullIfParentPageHasBeenClosed() {
+  @PlaywrightTest
+  void shouldReturnNullIfParentPageHasBeenClosed(Page page) {
     Page popup = page.waitForPopup(() -> page.evaluate("() => window.open('about:blank')"));
     page.close();
     Page opener = popup.opener();
     assertEquals(null, opener);
   }
 
-  @Test
-  void shouldFireDomcontentloadedWhenExpected() {
+  @PlaywrightTest
+  void shouldFireDomcontentloadedWhenExpected(Page page) {
     page.navigate("about:blank");
     page.waitForLoadState(DOMCONTENTLOADED);
   }
 
-  @Test
-  void shouldPassSelfAsArgumentToDomcontentloadedEvent() {
+  @PlaywrightTest
+  void shouldPassSelfAsArgumentToDomcontentloadedEvent(Page page) {
     Page[] eventPage = {null};
     page.onDOMContentLoaded(p -> eventPage[0] = p);
     page.navigate("about:blank");
@@ -170,8 +174,8 @@ void shouldPassSelfAsArgumentToDomcontentloadedEvent() {
     assertEquals(page, eventPage[0]);
   }
 
-  @Test
-  void shouldPassSelfAsArgumentToLoadEvent() {
+  @PlaywrightTest
+  void shouldPassSelfAsArgumentToLoadEvent(Page page) {
     Page[] eventPage = {null};
     page.onLoad(p -> eventPage[0] = p);
     page.navigate("about:blank");
@@ -183,15 +187,15 @@ void shouldPassSelfAsArgumentToLoadEvent() {
   void shouldFailWithErrorUponDisconnect() {
   }
 
-  @Test
-  void pageUrlShouldWork() {
+  @PlaywrightTest
+  void pageUrlShouldWork(Page page, Server server) {
     assertEquals("about:blank", page.url());
     page.navigate(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, page.url());
   }
 
-  @Test
-  void pageUrlShouldIncludeHashes() {
+  @PlaywrightTest
+  void pageUrlShouldIncludeHashes(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE + "#hash");
     assertEquals(server.EMPTY_PAGE + "#hash", page.url());
     page.evaluate("() => {\n" +
@@ -200,32 +204,32 @@ void pageUrlShouldIncludeHashes() {
     assertEquals(server.EMPTY_PAGE + "#dynamic", page.url());
   }
 
-  @Test
-  void pageTitleShouldReturnThePageTitle() {
+  @PlaywrightTest
+  void pageTitleShouldReturnThePageTitle(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     assertEquals("Woof-Woof", page.title());
   }
 
-  @Test
-  void pageCloseShouldWorkWithWindowClose() {
+  @PlaywrightTest
+  void pageCloseShouldWorkWithWindowClose(Page page) {
     Page newPage = page.waitForPopup(() -> page.evaluate(
       "() => window['newPage'] = window.open('about:blank')"));
     newPage.waitForClose(() -> page.evaluate("() => window['newPage'].close()"));
   }
 
-  @Test
-  void pageCloseShouldWorkWithPageClose() {
+  @PlaywrightTest
+  void pageCloseShouldWorkWithPageClose(BrowserContext context) {
     Page newPage = context.newPage();
     newPage.waitForClose(() -> newPage.close());
   }
 
-  @Test
-  void pageContextShouldReturnTheCorrectInstance() {
+  @PlaywrightTest
+  void pageContextShouldReturnTheCorrectInstance(Page page, BrowserContext context) {
     assertEquals(context, page.context());
   }
 
-  @Test
-  void pageFrameShouldRespectName() {
+  @PlaywrightTest
+  void pageFrameShouldRespectName(Page page) {
     page.setContent("<iframe name=target></iframe>");
     assertNull(page.frame("bogus"));
     Frame frame = page.frame("target");
@@ -233,8 +237,8 @@ void pageFrameShouldRespectName() {
     assertEquals(page.mainFrame().childFrames().get(0), frame);
   }
 
-  @Test
-  void pageFrameShouldRespectUrl() {
+  @PlaywrightTest
+  void pageFrameShouldRespectUrl(Page page, Server server) {
     page.setContent("<iframe src='" + server.EMPTY_PAGE + "'></iframe>");
     assertNull(page.frameByUrl(Pattern.compile("bogus")));
     Frame frame = page.frameByUrl(Pattern.compile(".*empty.*"));
@@ -242,8 +246,8 @@ void pageFrameShouldRespectUrl() {
     assertEquals(server.EMPTY_PAGE, frame.url());
   }
 
-  @Test
-  void shouldHaveSaneUserAgent() {
+  @PlaywrightTest
+  void shouldHaveSaneUserAgent(Page page, BrowserName browserName) {
     String userAgent = (String) page.evaluate("() => navigator.userAgent");
     List<String> parts = Arrays.stream(userAgent.split("[()]")).map(part -> part.trim()).collect(Collectors.toList());
     // First part is always 'Mozilla/5.0'
@@ -251,7 +255,7 @@ void shouldHaveSaneUserAgent() {
     // Second part in parenthesis is platform - ignore it.
 
     // Third part for Firefox is the last one and encodes engine and browser versions.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       String[] engineAndBrowser = parts.get(2).split(" ");
       assertTrue(engineAndBrowser[0].startsWith("Gecko"));
       assertTrue(engineAndBrowser[1].startsWith("Firefox"));
@@ -263,22 +267,22 @@ void shouldHaveSaneUserAgent() {
     // 5th part encodes real browser name and engine version.
     String[] engineAndBrowser = parts.get(4).split(" ");
     assertTrue(engineAndBrowser[1].startsWith("Safari"));
-    if (isChromium()) {
+    if (browserName == CHROMIUM) {
       assertTrue(engineAndBrowser[0].contains("Chrome/"));
     } else {
       assertTrue(engineAndBrowser[0].startsWith("Version/"));
     }
   }
 
-  @Test
-  void pagePressShouldWork() {
+  @PlaywrightTest
+  void pagePressShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.press("textarea", "a");
     assertEquals("a", page.evaluate("() => document.querySelector('textarea').value"));
   }
 
-  @Test
-  void pagePressShouldWorkForEnter() {
+  @PlaywrightTest
+  void pagePressShouldWorkForEnter(Page page) {
     page.setContent("<input onkeypress='console.log(\"press\")'></input>");
     List<ConsoleMessage> messages = new ArrayList<>();
     page.onConsoleMessage(message ->  messages.add(message));
@@ -286,17 +290,17 @@ void pagePressShouldWorkForEnter() {
     assertEquals("press", messages.get(0).text());
   }
 
-  @Test
-  void framePressShouldWork() {
+  @PlaywrightTest
+  void framePressShouldWork(Page page, Server server) {
     page.setContent("<iframe name=inner src='" + server.PREFIX + "/input/textarea.html'></iframe>");
     Frame frame = page.frame("inner");
     frame.press("textarea", "a");
     assertEquals("a", frame.evaluate("() => document.querySelector('textarea').value"));
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="fail")
-  void frameFocusShouldWorkMultipleTimes() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "fail")
+  void frameFocusShouldWorkMultipleTimes(BrowserContext context) {
     Page page1 = context.newPage();
     Page page2 = context.newPage();
     for (Page page : asList(page1, page2)) {
@@ -306,15 +310,15 @@ void frameFocusShouldWorkMultipleTimes() {
     }
   }
 
-  @Test
-  void frameDragAndDropShouldWork() {
+  @PlaywrightTest
+  void frameDragAndDropShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     page.dragAndDrop("#source", "#target");
     assertEquals(true, page.evalOnSelector("#target", "target => target.contains(document.querySelector('#source'))"));
   }
 
-  @Test
-  void shouldWaitForCondition() {
+  @PlaywrightTest
+  void shouldWaitForCondition(Page page) {
     List<String> messages = new ArrayList<>();
     page.onConsoleMessage(m -> messages.add(m.text()));
     page.evaluate("setTimeout(() => {\n" +
@@ -325,14 +329,14 @@ void shouldWaitForCondition() {
     assertEquals(asList("foo", "bar"), messages);
   }
 
-  @Test
-  void waitForConditionTimeout() {
+  @PlaywrightTest
+  void waitForConditionTimeout(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> page.waitForCondition(() -> false, new Page.WaitForConditionOptions().setTimeout(100)));
     assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
   }
-  @Test
-  void waitForConditionPageClosed() {
+  @PlaywrightTest
+  void waitForConditionPageClosed(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class,
       () -> page.waitForCondition(() -> {
         page.close();
@@ -341,8 +345,8 @@ void waitForConditionPageClosed() {
     assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
-  void shouldPropagateCloseReasonToPendingActions() {
+  @PlaywrightTest
+  void shouldPropagateCloseReasonToPendingActions(BrowserContext context) {
     Page page = context.newPage();
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.waitForPopup(() -> {
       page.close(new Page.CloseOptions().setReason("The reason."));
@@ -350,8 +354,8 @@ void shouldPropagateCloseReasonToPendingActions() {
     assertTrue(e.getMessage().contains("The reason."), e.getMessage());
   }
 
-  @Test
-  void shouldProhibitNullListeners() {
+  @PlaywrightTest
+  void shouldProhibitNullListeners(BrowserContext context) {
     Page newPage = context.newPage();
 
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> newPage.onClose(null));
@@ -359,8 +363,8 @@ void shouldProhibitNullListeners() {
     assertTrue(e.getMessage().contains("Can't add a null listener"));
   }
 
-  @Test
-  void pagePauseShouldNotThrow() {
+  @PlaywrightTest
+  void pagePauseShouldNotThrow(Page page) {
     page.pause();
   }
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageCheck.java b/playwright/src/test/java/com/microsoft/playwright/TestPageCheck.java
index d7ad2f787..d50219158 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageCheck.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageCheck.java
@@ -16,14 +16,14 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BoundingBox;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageCheck extends TestBase {
-  @Test
-  void shouldCheckTheLabelWithPosition() {
+public class TestPageCheck {
+  @PlaywrightTest
+  void shouldCheckTheLabelWithPosition(Page page, Server server) {
     page.setContent("<input id='checkbox' type='checkbox' style='width: 5px; height: 5px;'>\n" +
       "    <label for='checkbox'>\n" +
       "      <a href=" + server.EMPTY_PAGE + ">I am a long link that goes away so that nothing good will happen if you click on me</a>\n" +
@@ -34,22 +34,22 @@ void shouldCheckTheLabelWithPosition() {
     assertEquals(true, page.evalOnSelector("input", "input => input.checked"));
   }
 
-  @Test
-  void trialRunShouldNotCheck() {
+  @PlaywrightTest
+  void trialRunShouldNotCheck(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     page.check("input", new Page.CheckOptions().setTrial(true));
     assertEquals(false, page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void trialRunShouldNotUncheck() {
+  @PlaywrightTest
+  void trialRunShouldNotUncheck(Page page) {
     page.setContent("<input id='checkbox' type='checkbox' checked></input>");
     page.uncheck("input", new Page.UncheckOptions().setTrial(true));
     assertEquals(true, page.evaluate("() => window['checkbox'].checked"));
   }
 
-  @Test
-  void shouldCheckTheBoxUsingSetChecked() {
+  @PlaywrightTest
+  void shouldCheckTheBoxUsingSetChecked(Page page) {
     page.setContent("<input id='checkbox' type='checkbox'></input>");
     page.setChecked("input", true);
     assertEquals(true, page.evaluate("() => window['checkbox'].checked"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageClock.java b/playwright/src/test/java/com/microsoft/playwright/TestPageClock.java
index d00d365d6..4db021104 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageClock.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageClock.java
@@ -1,9 +1,7 @@
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.io.Writer;
@@ -15,8 +13,6 @@
 import static com.microsoft.playwright.Utils.assertJsonEquals;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright
 public class TestPageClock {
   private ArrayList<Object> calls;
 
@@ -34,7 +30,7 @@ private void setupRunForTest(Page page) {
     page.clock().pauseAt(1000);
   }
 
-  @Test
+  @PlaywrightTest
   void runForTriggersImmediatelyWithoutSpecifiedDelay(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setTimeout(window.stub)");
@@ -42,7 +38,7 @@ void runForTriggersImmediatelyWithoutSpecifiedDelay(Page page) {
     assertEquals(1, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForDoesNotTriggerWithoutSufficientDelay(Page page) {
     setupRunForTest(page);
     // Trigger the stub with a delay
@@ -51,7 +47,7 @@ void runForDoesNotTriggerWithoutSufficientDelay(Page page) {
     assertEquals(0, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void  runForTriggersAfterSufficientDelay(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setTimeout(window.stub, 100)");
@@ -59,7 +55,7 @@ void  runForTriggersAfterSufficientDelay(Page page) {
     assertEquals(1, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void  runForTriggersSimultaneousTimers(Page page) {
     setupRunForTest(page);
     page.evaluate("() => { setTimeout(window.stub, 100);" +
@@ -68,7 +64,7 @@ void  runForTriggersSimultaneousTimers(Page page) {
     assertEquals(2, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void  runForTriggersMultipleSimultaneousTimers(Page page) {
     setupRunForTest(page);
     page.evaluate("() => { setTimeout(window.stub, 100);" +
@@ -79,7 +75,7 @@ void  runForTriggersMultipleSimultaneousTimers(Page page) {
     assertEquals(4, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void  runForWaitsAfterSetTimeoutWasCalled(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setTimeout(window.stub, 150)");
@@ -89,7 +85,7 @@ void  runForWaitsAfterSetTimeoutWasCalled(Page page) {
     assertEquals(1, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForTriggersEventWhenSomeThrow(Page page) {
     setupRunForTest(page);
     page.evaluate("() => {\n" +
@@ -100,7 +96,7 @@ void runForTriggersEventWhenSomeThrow(Page page) {
     assertEquals(1, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForCreatesUpdatedDateWhileTicking(Page page) {
     setupRunForTest(page);
     page.clock().setSystemTime(0);
@@ -109,7 +105,7 @@ void runForCreatesUpdatedDateWhileTicking(Page page) {
     assertJsonEquals("[[10],[20],[30],[40],[50],[60],[70],[80],[90],[100]]", calls);
   }
 
-  @Test
+  @PlaywrightTest
   void runForPasses8Seconds(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setInterval(window.stub, 4000)");
@@ -117,7 +113,7 @@ void runForPasses8Seconds(Page page) {
     assertEquals(2, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForPasses1Minute(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setInterval(window.stub, 6000)");
@@ -125,7 +121,7 @@ void runForPasses1Minute(Page page) {
     assertEquals(10, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForPasses2Hours34MinutesAnd10Seconds(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setInterval(window.stub, 10000)");
@@ -133,7 +129,7 @@ void runForPasses2Hours34MinutesAnd10Seconds(Page page) {
     assertEquals(925, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForThrowsForInvalidFormat(Page page) {
     setupRunForTest(page);
     page.evaluate("() => setInterval(window.stub, 10000)");
@@ -141,7 +137,7 @@ void runForThrowsForInvalidFormat(Page page) {
     assertEquals(0, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void runForReturnsTheCurrentNowValue(Page page) {
     setupRunForTest(page);
     page.clock().setSystemTime(0);
@@ -155,7 +151,7 @@ private void setupFastForwardTest(Page page) {
     page.clock().pauseAt(1000);
   }
 
-  @Test
+  @PlaywrightTest
   void fastForwardIgnoresTimersWhichWouldntBeRun(Page page) {
     setupFastForwardTest(page);
     page.evaluate("() => setTimeout(() => { window.stub('should not be logged'); }, 1000)");
@@ -163,7 +159,7 @@ void fastForwardIgnoresTimersWhichWouldntBeRun(Page page) {
     assertEquals(0, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void fastForwardPushesBackExecutionTimeForSkippedTimers(Page page) {
     setupFastForwardTest(page);
     page.evaluate("() => setTimeout(() => { window.stub(Date.now()); }, 1000)");
@@ -172,7 +168,7 @@ void fastForwardPushesBackExecutionTimeForSkippedTimers(Page page) {
     assertEquals(1000 + 2000, ((Object[])calls.get(0))[0]);
   }
 
-  @Test
+  @PlaywrightTest
   void fastForwardSupportsStringTimeArguments(Page page) {
     setupFastForwardTest(page);
     page.evaluate("() => setTimeout(() => { window.stub(Date.now()); }, 100000)");
@@ -186,14 +182,14 @@ private void setupStubTimers(Page page) {
     page.clock().pauseAt(1000);
   }
 
-  @Test
+  @PlaywrightTest
   void setsInitialTimestamp(Page page) {
     setupStubTimers(page);
     page.clock().setSystemTime(1400);
     assertEquals(1400, page.evaluate("() => Date.now()"));
   }
 
-  @Test
+  @PlaywrightTest
   void replacesGlobalSetTimeout(Page page) {
     setupStubTimers(page);
     page.evaluate("() => setTimeout(window.stub, 1000)");
@@ -201,14 +197,14 @@ void replacesGlobalSetTimeout(Page page) {
     assertEquals(1, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void globalFakeSetTimeoutShouldReturnId(Page page) {
     setupStubTimers(page);
     Double to = (Double) page.evaluate("() => setTimeout(window.stub, 1000)");
     assertTrue(to > 0);
   }
 
-  @Test
+  @PlaywrightTest
   void replacesGlobalClearTimeout(Page page) {
     setupStubTimers(page);
     page.evaluate("() => { const to = setTimeout(window.stub, 1000); clearTimeout(to); }");
@@ -216,7 +212,7 @@ void replacesGlobalClearTimeout(Page page) {
     assertEquals(0, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void replacesGlobalSetInterval(Page page) {
     setupStubTimers(page);
     page.evaluate("() => setInterval(window.stub, 500)");
@@ -224,7 +220,7 @@ void replacesGlobalSetInterval(Page page) {
     assertEquals(2, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void replacesGlobalClearInterval(Page page) {
     setupStubTimers(page);
     page.evaluate("() => { const to = setInterval(window.stub, 500); clearInterval(to); }");
@@ -232,23 +228,23 @@ void replacesGlobalClearInterval(Page page) {
     assertEquals(0, calls.size());
   }
 
-  @Test
+  @PlaywrightTest
   void replacesGlobalPerformanceNow(Page page) {
   }
 
-  @Test
+  @PlaywrightTest
   void fakesDateConstructor(Page page) {
     setupStubTimers(page);
     Integer now = (Integer) page.evaluate("() => new Date().getTime()");
     assertEquals(1000, now);
   }
 
-  @Test
+  @PlaywrightTest
   void replacesGlobalPerformanceTimeOrigin(Page page) {
   }
 
 
-  @Test
+  @PlaywrightTest
   void shouldTickAfterPopup(Page page) throws ParseException {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     Date now = new SimpleDateFormat("yyyy-MM-dd").parse("2015-09-25");
@@ -263,7 +259,7 @@ void shouldTickAfterPopup(Page page) throws ParseException {
     assertEquals(now.getTime() + 1000, popupTimeAfter);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldTickBeforePopup(Page page) throws ParseException {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     Date now = new SimpleDateFormat("yyyy-MM-dd").parse("2015-09-25");
@@ -276,7 +272,7 @@ void shouldTickBeforePopup(Page page) throws ParseException {
     assertEquals(now.getTime() + 1000, popupTime);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldRunTimeBeforePopup(Page page, Server server) {
     server.setRoute("/popup.html", exchange -> {
       exchange.getResponseHeaders().set("Content-type", "text/html");
@@ -295,7 +291,7 @@ void shouldRunTimeBeforePopup(Page page, Server server) {
     assertTrue(popupTime >= 2000, "popupTime = " + popupTime);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldNotRunTimeBeforePopupOnPause(Page page, Server server) {
     server.setRoute("/popup.html", exchange -> {
       exchange.getResponseHeaders().set("Content-type", "text/html");
@@ -316,14 +312,14 @@ void shouldNotRunTimeBeforePopupOnPause(Page page, Server server) {
     assertEquals(1000, popupTime);
   }
 
-  @Test
+  @PlaywrightTest
   void setFixedTimeDoesNotFakeMethods(Page page) {
     page.clock().setFixedTime(0);
     // Should not stall.
     page.evaluate("() => new Promise(f => setTimeout(f, 1))");
   }
 
-  @Test
+  @PlaywrightTest
   void setFixedTimeAllowsSettingTimeMultipleTimes(Page page) {
     page.clock().setFixedTime(100);
     assertEquals(100, page.evaluate("() => Date.now()"));
@@ -331,7 +327,7 @@ void setFixedTimeAllowsSettingTimeMultipleTimes(Page page) {
     assertEquals(200, page.evaluate("() => Date.now()"));
   }
 
-  @Test
+  @PlaywrightTest
   void setFixedTimeFixedTimeIsNotAffectedByClockManipulation(Page page) {
     page.clock().setFixedTime(100);
     assertEquals(100, page.evaluate("() => Date.now()"));
@@ -339,7 +335,7 @@ void setFixedTimeFixedTimeIsNotAffectedByClockManipulation(Page page) {
     assertEquals(100, page.evaluate("() => Date.now()"));
   }
 
-  @Test
+  @PlaywrightTest
   void setFixedTimeAllowsInstallingFakeTimersAfterSettingTime(Page page) {
     page.clock().setFixedTime(100);
     assertEquals(100, page.evaluate("() => Date.now()"));
@@ -350,7 +346,7 @@ void setFixedTimeAllowsInstallingFakeTimersAfterSettingTime(Page page) {
     assertEquals(200, ((Object[]) calls.get(0))[0]);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldProgressTime(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -359,7 +355,7 @@ void whileRunningShouldProgressTime(Page page) {
     assertTrue(now >= 1000 && now <= 2000);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldRunFor(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -368,7 +364,7 @@ void whileRunningShouldRunFor(Page page) {
     assertTrue(now >= 10000 && now <= 11000);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldFastForward(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -377,7 +373,7 @@ void whileRunningShouldFastForward(Page page) {
     assertTrue(now >= 10000 && now <= 11000);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldFastForwardTo(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -386,7 +382,7 @@ void whileRunningShouldFastForwardTo(Page page) {
     assertTrue(now >= 10000 && now <= 11000);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldPause(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -397,7 +393,7 @@ void whileRunningShouldPause(Page page) {
     assertTrue(now >= 0 && now <= 1000);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldPauseAndFastForward(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -407,7 +403,7 @@ void whileRunningShouldPauseAndFastForward(Page page) {
     assertEquals(2000, now);
   }
 
-  @Test
+  @PlaywrightTest
   void whileRunningShouldSetSystemTimeOnPause(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -416,7 +412,7 @@ void whileRunningShouldSetSystemTimeOnPause(Page page) {
     assertEquals(1000, now);
   }
 
-  @Test
+  @PlaywrightTest
   void whileOnPauseFastForwardShouldNotRunNestedImmediate(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -430,7 +426,7 @@ void whileOnPauseFastForwardShouldNotRunNestedImmediate(Page page) {
     assertEquals("inner", ((Object[]) calls.get(1))[0]);
   }
 
-  @Test
+  @PlaywrightTest
   void whileOnPauseRunForShouldNotRunNestedImmediate(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -444,7 +440,7 @@ void whileOnPauseRunForShouldNotRunNestedImmediate(Page page) {
     assertEquals("inner", ((Object[]) calls.get(1))[0]);
   }
 
-  @Test
+  @PlaywrightTest
   void whileOnPauseRunForShouldNotRunNestedImmediateFromMicrotask(Page page) {
     page.clock().install(new Clock.InstallOptions().setTime(0));
     page.navigate("data:text/html,");
@@ -458,7 +454,7 @@ void whileOnPauseRunForShouldNotRunNestedImmediateFromMicrotask(Page page) {
     assertEquals("inner", ((Object[]) calls.get(1))[0]);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldThrowForInvalidDate(Page page) {
     Exception exception1 = assertThrows(PlaywrightException.class, () -> page.clock().setSystemTime("invalid"));
     assertTrue(exception1.getMessage().contains("Invalid date: invalid"), exception1.getMessage());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageDialog.java b/playwright/src/test/java/com/microsoft/playwright/TestPageDialog.java
index 975dbed37..3df7889d0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageDialog.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageDialog.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class TestPageDialog extends TestBase {
-  @Test
-  void shouldFire() {
+public class TestPageDialog {
+  @PlaywrightTest
+  void shouldFire(Page page) {
     page.onDialog(dialog -> {
       assertEquals("alert", dialog.type());
       assertEquals("", dialog.defaultValue());
@@ -36,8 +36,8 @@ void shouldFire() {
     page.evaluate("alert('yo')");
   }
 
-  @Test
-  void shouldAllowAcceptingPrompts() {
+  @PlaywrightTest
+  void shouldAllowAcceptingPrompts(Page page) {
     page.onDialog(dialog -> {
       assertEquals("prompt", dialog.type());
       assertEquals("yes.", dialog.defaultValue());
@@ -48,8 +48,8 @@ void shouldAllowAcceptingPrompts() {
     assertEquals("answer!", result);
   }
 
-  @Test
-  void shouldDismissThePrompt() {
+  @PlaywrightTest
+  void shouldDismissThePrompt(Page page) {
     page.onDialog(dialog -> {
       dialog.dismiss();
     });
@@ -57,8 +57,8 @@ void shouldDismissThePrompt() {
     assertNull(result);
   }
 
-  @Test
-  void shouldAcceptTheConfirmPrompt() {
+  @PlaywrightTest
+  void shouldAcceptTheConfirmPrompt(Page page) {
     page.onDialog(dialog -> {
       dialog.accept();
     });
@@ -66,8 +66,8 @@ void shouldAcceptTheConfirmPrompt() {
     assertEquals(true, result);
   }
 
-  @Test
-  void shouldDismissTheConfirmPrompt() {
+  @PlaywrightTest
+  void shouldDismissTheConfirmPrompt(Page page) {
     page.onDialog(dialog -> {
       dialog.dismiss();
     });
@@ -75,8 +75,8 @@ void shouldDismissTheConfirmPrompt() {
     assertEquals(false, result);
   }
 
-  @Test
-  void shouldBeAbleToCloseContextWithOpenAlert() {
+  @PlaywrightTest
+  void shouldBeAbleToCloseContextWithOpenAlert(BrowserContext context) {
     Page page = context.newPage();
     boolean[] didShowDialog = {false};
     page.onDialog(dialog -> didShowDialog[0] = true);
@@ -86,8 +86,8 @@ void shouldBeAbleToCloseContextWithOpenAlert() {
     }
   }
 
-  @Test
-  void shouldHandleMultipleAlerts() {
+  @PlaywrightTest
+  void shouldHandleMultipleAlerts(Page page) {
     page.onDialog(dialog -> {
       dialog.accept();
     });
@@ -100,8 +100,8 @@ void shouldHandleMultipleAlerts() {
     assertEquals("Hello World", page.textContent("p"));
   }
 
-  @Test
-  void shouldHandleMultipleConfirms() {
+  @PlaywrightTest
+  void shouldHandleMultipleConfirms(Page page) {
     page.onDialog(dialog -> {
       dialog.accept();
     });
@@ -114,21 +114,21 @@ void shouldHandleMultipleConfirms() {
     assertEquals("Hello World", page.textContent("p"));
   }
 
-  @Test
-  void shouldAutoDismissThePromptWithoutListeners() {
+  @PlaywrightTest
+  void shouldAutoDismissThePromptWithoutListeners(Page page) {
     Object result = page.evaluate("() => prompt('question?')");
     assertNull(result);
   }
 
-  @Test
-  void shouldAutoDismissTheAlertWithoutListeners() {
+  @PlaywrightTest
+  void shouldAutoDismissTheAlertWithoutListeners(Page page) {
     page.setContent("<div onclick='window.alert(123); window._clicked=true'>Click me</div>");
     page.click("div");
     assertEquals(true, page.evaluate("window._clicked"));
   }
 
-  @Test
-  void shouldFireDialogClosedWhenDialogIsAccepted() {
+  @PlaywrightTest
+  void shouldFireDialogClosedWhenDialogIsAccepted(Page page) {
     List<Dialog> closed = new ArrayList<>();
     page.onDialogClosed(closed::add);
     Dialog[] opened = {null};
@@ -145,8 +145,8 @@ void shouldFireDialogClosedWhenDialogIsAccepted() {
     assertEquals(1, closed.size());
   }
 
-  @Test
-  void shouldFireDialogClosedWhenDialogIsDismissed() {
+  @PlaywrightTest
+  void shouldFireDialogClosedWhenDialogIsDismissed(Page page) {
     Dialog[] closed = {null};
     page.onDialogClosed(dialog -> closed[0] = dialog);
     page.onDialog(Dialog::dismiss);
@@ -156,8 +156,8 @@ void shouldFireDialogClosedWhenDialogIsDismissed() {
     assertEquals("boolean?", closed[0].message());
   }
 
-  @Test
-  void shouldFireDialogClosedForAutoDismissedDialogs() {
+  @PlaywrightTest
+  void shouldFireDialogClosedForAutoDismissedDialogs(Page page) {
     Dialog[] closed = {null};
     page.onDialogClosed(dialog -> closed[0] = dialog);
     page.evaluate("alert('yo')");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java b/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java
index 6a4e75b61..5644c28f9 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageDrag.java
@@ -17,7 +17,7 @@
 package com.microsoft.playwright;
 
 import com.google.gson.Gson;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 
@@ -25,9 +25,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageDrag extends TestBase {
-  @Test
-  void shouldWorkIfTheDragIsCanceled() {
+public class TestPageDrag {
+  @PlaywrightTest
+  void shouldWorkIfTheDragIsCanceled(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     page.evaluate("() => {\n" +
       "      document.body.addEventListener('dragstart', event => {\n" +
@@ -41,8 +41,8 @@ void shouldWorkIfTheDragIsCanceled() {
     assertEquals(false, page.evalOnSelector("#target", "target => target.contains(document.querySelector('#source'))"));
   }
 
-  @Test
-  void shouldWorkIfTheDragEventIsCapturedButNotCanceled() {
+  @PlaywrightTest
+  void shouldWorkIfTheDragEventIsCapturedButNotCanceled(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     page.evaluate("() => {\n" +
       "      document.body.addEventListener('dragstart', event => {\n" +
@@ -56,8 +56,8 @@ void shouldWorkIfTheDragEventIsCapturedButNotCanceled() {
     assertEquals(true, page.evalOnSelector("#target", "target => target.contains(document.querySelector('#source'))"));
   }
 
-  @Test
-  void shouldBeAbleToDragTheMouseInAFrame() {
+  @PlaywrightTest
+  void shouldBeAbleToDragTheMouseInAFrame(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     JSHandle eventsHandle = trackEvents(page.frames().get(1).querySelector("html"));
     page.mouse().move(30, 30);
@@ -80,16 +80,16 @@ private static JSHandle trackEvents(ElementHandle target) {
       "}");
   }
 
-  @Test
-  void shouldWorkWithTheHelperMethod() {
+  @PlaywrightTest
+  void shouldWorkWithTheHelperMethod(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     page.dragAndDrop("#source", "#target");
     assertEquals(true, page.evalOnSelector("#target",
       "target => target.contains(document.querySelector('#source'))")); // could not find source in target
   }
 
-  @Test
-  void shouldAllowSpecifyingThePosition() {
+  @PlaywrightTest
+  void shouldAllowSpecifyingThePosition(Page page) {
     page.setContent("<div style='width:100px;height:100px;background:red;' id='red'>\n" +
       "</div>\n" +
       "<div style='width:100px;height:100px;background:blue;' id='blue'>\n" +
@@ -118,15 +118,15 @@ void shouldAllowSpecifyingThePosition() {
     assertJsonEquals("[{type: \"mousedown\", x: 34, y: 7},{type: \"mouseup\", x: 10, y: 20}]", json);
   }
 
-  @Test
-  void shouldWorkWithLocators() {
+  @PlaywrightTest
+  void shouldWorkWithLocators(Page page, Server server) {
     page.navigate(server.PREFIX + "/drag-n-drop.html");
     page.locator("#source").dragTo(page.locator("#target"));
     assertEquals(true, page.evalOnSelector("#target", "target => target.contains(document.querySelector('#source'))"));
   }
 
-  @Test
-  void shouldDragAndDropWithTweenedMouseMovement() {
+  @PlaywrightTest
+  void shouldDragAndDropWithTweenedMouseMovement(Page page) {
     page.setContent(
       "<body style='margin: 0; padding: 0;'>\n" +
       "  <div style='width:100px;height:100px;background:red;' id='red'></div>\n" +
@@ -170,8 +170,8 @@ void shouldDragAndDropWithTweenedMouseMovement() {
     );
   }
 
-  @Test
-  void shouldDragToWithTweenedMouseMovement() {
+  @PlaywrightTest
+  void shouldDragToWithTweenedMouseMovement(Page page) {
     page.setContent(
       "<body style='margin: 0; padding: 0;'>\n" +
       "  <div style='width:100px;height:100px;background:red;' id='red'></div>\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java b/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java
index bfa92700c..55a21f84c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageDrop.java
@@ -16,9 +16,9 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.options.FilePayload;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.DropPayload;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.options.FilePayload;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -32,8 +32,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestPageDrop extends TestBase {
-  private void setupDropzone() {
+public class TestPageDrop {
+  private void setupDropzone(Page page) {
     page.setContent("<style>#dropzone { width: 300px; height: 200px; border: 2px dashed #888; }</style>\n" +
       "<div id=\"dropzone\"></div>\n" +
       "<script>\n" +
@@ -57,16 +57,16 @@ private void setupDropzone() {
   }
 
   @SuppressWarnings("unchecked")
-  private Map<String, Object> waitForDropInfo() {
+  private Map<String, Object> waitForDropInfo(Page page) {
     page.waitForCondition(() -> page.evaluate("window.__dropInfo") != null);
     return (Map<String, Object>) page.evaluate("window.__dropInfo");
   }
 
-  @Test
-  void shouldDropFilePayload() {
-    setupDropzone();
+  @PlaywrightTest
+  void shouldDropFilePayload(Page page) {
+    setupDropzone(page);
     page.locator("#dropzone").drop(new DropPayload().setFiles(new FilePayload("note.txt", "text/plain", "hello".getBytes(StandardCharsets.UTF_8))));
-    Map<String, Object> info = waitForDropInfo();
+    Map<String, Object> info = waitForDropInfo(page);
     @SuppressWarnings("unchecked")
     List<Map<String, Object>> files = (List<Map<String, Object>>) info.get("files");
     assertEquals(1, files.size());
@@ -75,14 +75,14 @@ void shouldDropFilePayload() {
     assertEquals("hello", files.get(0).get("text"));
   }
 
-  @Test
-  void shouldDropMultipleFilePayloads() {
-    setupDropzone();
+  @PlaywrightTest
+  void shouldDropMultipleFilePayloads(Page page) {
+    setupDropzone(page);
     page.locator("#dropzone").drop(new DropPayload().setFiles(new FilePayload[] {
       new FilePayload("a.txt", "text/plain", "AAA".getBytes(StandardCharsets.UTF_8)),
       new FilePayload("b.txt", "text/plain", "BB".getBytes(StandardCharsets.UTF_8)),
     }));
-    Map<String, Object> info = waitForDropInfo();
+    Map<String, Object> info = waitForDropInfo(page);
     @SuppressWarnings("unchecked")
     List<Map<String, Object>> files = (List<Map<String, Object>>) info.get("files");
     assertEquals(2, files.size());
@@ -92,14 +92,14 @@ void shouldDropMultipleFilePayloads() {
     assertEquals("BB", files.get(1).get("text"));
   }
 
-  @Test
-  void shouldDropClipboardLikeData() {
-    setupDropzone();
+  @PlaywrightTest
+  void shouldDropClipboardLikeData(Page page) {
+    setupDropzone(page);
     Map<String, String> data = new HashMap<>();
     data.put("text/plain", "hello world");
     data.put("text/uri-list", "https://example.com");
     page.locator("#dropzone").drop(new DropPayload().setData(data));
-    Map<String, Object> info = waitForDropInfo();
+    Map<String, Object> info = waitForDropInfo(page);
     @SuppressWarnings("unchecked")
     List<?> files = (List<?>) info.get("files");
     assertTrue(files.isEmpty(), "expected no files");
@@ -109,13 +109,13 @@ void shouldDropClipboardLikeData() {
     assertEquals("https://example.com", droppedData.get("text/uri-list"));
   }
 
-  @Test
-  void shouldDropFileByLocalPath(@org.junit.jupiter.api.io.TempDir Path dir) throws Exception {
-    setupDropzone();
+  @PlaywrightTest
+  void shouldDropFileByLocalPath(Page page, @org.junit.jupiter.api.io.TempDir Path dir) throws Exception {
+    setupDropzone(page);
     Path filePath = dir.resolve("hello.txt");
     Files.write(filePath, "path-content".getBytes(StandardCharsets.UTF_8));
     page.locator("#dropzone").drop(new DropPayload().setFiles(filePath));
-    Map<String, Object> info = waitForDropInfo();
+    Map<String, Object> info = waitForDropInfo(page);
     @SuppressWarnings("unchecked")
     List<Map<String, Object>> files = (List<Map<String, Object>>) info.get("files");
     assertEquals(1, files.size());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java
index 0d988b7fa..325ba43a6 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEmulateMedia.java
@@ -16,23 +16,25 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Contrast;
 import com.microsoft.playwright.options.ForcedColors;
 import com.microsoft.playwright.options.ReducedMotion;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.util.function.Supplier;
 
+import static com.microsoft.playwright.Utils.attachFrame;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static com.microsoft.playwright.options.ColorScheme.DARK;
 import static com.microsoft.playwright.options.ColorScheme.LIGHT;
 import static com.microsoft.playwright.options.Media.PRINT;
-import static com.microsoft.playwright.Utils.attachFrame;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageEmulateMedia extends TestBase {
-  @Test
-  void shouldEmulateType() {
+public class TestPageEmulateMedia {
+  @PlaywrightTest
+  void shouldEmulateType(Page page) {
     assertEquals(true, page.evaluate("() => matchMedia('screen').matches"));
     assertEquals(false, page.evaluate("() => matchMedia('print').matches"));
     page.emulateMedia(new Page.EmulateMediaOptions().setMedia(PRINT));
@@ -50,8 +52,8 @@ void shouldThrowInCaseOfBadTypeArgument() {
     // Impossible in Java.
   }
 
-  @Test
-  void shouldEmulateSchemeWork() {
+  @PlaywrightTest
+  void shouldEmulateSchemeWork(Page page) {
     page.emulateMedia(new Page.EmulateMediaOptions().setColorScheme(LIGHT));
     assertEquals(true, page.evaluate("() => matchMedia('(prefers-color-scheme: light)').matches"));
     assertEquals(false, page.evaluate("() => matchMedia('(prefers-color-scheme: dark)').matches"));
@@ -60,8 +62,8 @@ void shouldEmulateSchemeWork() {
     assertEquals(false, page.evaluate("() => matchMedia('(prefers-color-scheme: light)').matches"));
   }
 
-  @Test
-  void shouldDefaultToLight() {
+  @PlaywrightTest
+  void shouldDefaultToLight(Page page) {
     assertEquals(true, page.evaluate("() => matchMedia('(prefers-color-scheme: light)').matches"));
     assertEquals(false, page.evaluate("() => matchMedia('(prefers-color-scheme: dark)').matches"));
 
@@ -83,8 +85,8 @@ void shouldWorkDuringNavigation() {
     // TODO: requires async API
   }
 
-  @Test
-  void shouldWorkInPopup() {
+  @PlaywrightTest
+  void shouldWorkInPopup(Browser browser, Server server) {
     {
       BrowserContext context = browser.newContext(new Browser.NewContextOptions().setColorScheme(DARK));
       Page page = context.newPage();
@@ -104,8 +106,8 @@ void shouldWorkInPopup() {
     }
   }
 
-  @Test
-  void shouldWorkInCrossProcessIframe() {
+  @PlaywrightTest
+  void shouldWorkInCrossProcessIframe(Browser browser, Server server) {
     Page page = browser.newPage(new Browser.NewPageOptions().setColorScheme(DARK));
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "frame1", server.CROSS_PROCESS_PREFIX + "/empty.html");
@@ -114,8 +116,8 @@ void shouldWorkInCrossProcessIframe() {
     page.close();
   }
 
-  @Test
-  void shouldChangeTheActualColorsInCss() {
+  @PlaywrightTest
+  void shouldChangeTheActualColorsInCss(Page page) {
     page.setContent("<style>\n" +
       "@media (prefers-color-scheme: dark) {\n" +
       "  div {\n" +
@@ -146,8 +148,8 @@ void shouldChangeTheActualColorsInCss() {
     assertEquals("rgb(255, 255, 255)", backgroundColor.get());
   }
 
-  @Test
-  void shouldEmulateReducedMotion() {
+  @PlaywrightTest
+  void shouldEmulateReducedMotion(Page page) {
     assertEquals(true, page.evaluate("() => matchMedia('(prefers-reduced-motion: no-preference)').matches"));
     page.emulateMedia(new Page.EmulateMediaOptions().setReducedMotion(ReducedMotion.REDUCE));
     assertEquals(true, page.evaluate("() => matchMedia('(prefers-reduced-motion: reduce)').matches"));
@@ -158,9 +160,9 @@ void shouldEmulateReducedMotion() {
     page.emulateMedia(new Page.EmulateMediaOptions().setReducedMotion(null));
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="https://bugs.webkit.org/show_bug.cgi?id=225281")
-  void shouldEmulateForcedColors() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "https://bugs.webkit.org/show_bug.cgi?id=225281")
+  void shouldEmulateForcedColors(Page page) {
     assertEquals(true, page.evaluate("() => matchMedia('(forced-colors: none)').matches"));
     page.emulateMedia(new Page.EmulateMediaOptions().setForcedColors(ForcedColors.NONE));
     assertEquals(true, page.evaluate("() => matchMedia('(forced-colors: none)').matches"));
@@ -172,8 +174,8 @@ void shouldEmulateForcedColors() {
     assertEquals(true, page.evaluate("() => matchMedia('(forced-colors: none)').matches"));
   }
 
-  @Test
-  void shouldEmulateContrast() {
+  @PlaywrightTest
+  void shouldEmulateContrast(Page page) {
     assertEquals(true, page.evaluate("matchMedia('(prefers-contrast: no-preference)').matches"));
     page.emulateMedia(new Page.EmulateMediaOptions().setContrast(Contrast.NO_PREFERENCE));
     assertEquals(true, page.evaluate("matchMedia('(prefers-contrast: no-preference)').matches"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEvaluate.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEvaluate.java
index d7a9f2016..173ed7f7f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEvaluate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEvaluate.java
@@ -16,63 +16,64 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.time.*;
+import java.util.Date;
 import java.util.Map;
 import java.util.regex.Pattern;
-import java.util.Date;
-import java.net.MalformedURLException;
-import java.net.URL;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageEvaluate extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageEvaluate {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     Object result = page.evaluate("() => 7 * 3");
     assertEquals(21, result);
   }
 
-  @Test
-  void shouldTransferNaN() {
+  @PlaywrightTest
+  void shouldTransferNaN(Page page) {
     Object result = page.evaluate("a => a", Double.NaN);
     assertTrue(Double.isNaN((Double) result));
   }
 
-  @Test
-  void shouldTransfer0() {
+  @PlaywrightTest
+  void shouldTransfer0(Page page) {
     Object result = page.evaluate("a => a", -0.0);
     assertEquals(Double.NEGATIVE_INFINITY, 1 / (Double) result);
   }
 
-  @Test
-  void shouldTransferPositive0() {
+  @PlaywrightTest
+  void shouldTransferPositive0(Page page) {
     assertEquals(true, page.evaluate("a => Object.is(a, 0)", 0.0));
     Object result = page.evaluate("a => a", 0.0);
     assertEquals(Double.POSITIVE_INFINITY, 1 / ((Number) result).doubleValue());
   }
 
-  @Test
-  void shouldTransferInfinity() {
+  @PlaywrightTest
+  void shouldTransferInfinity(Page page) {
     Object result = page.evaluate("a => a", Double.POSITIVE_INFINITY);
     assertTrue(Double.POSITIVE_INFINITY == (Double) result);
   }
 
-  @Test
-  void shouldTransferNegativeInfinity() {
+  @PlaywrightTest
+  void shouldTransferNegativeInfinity(Page page) {
     Object result = page.evaluate("a => a", Double.NEGATIVE_INFINITY);
     assertTrue(Double.NEGATIVE_INFINITY == (Double) result);
   }
 
-  @Test
-  void shouldRoundtripUnserializableValues() {
+  @PlaywrightTest
+  void shouldRoundtripUnserializableValues(Page page) {
     Map<String, ?> value = mapOf(
       "infinity", Double.POSITIVE_INFINITY,
       "nInfinity", Double.NEGATIVE_INFINITY,
@@ -83,8 +84,8 @@ void shouldRoundtripUnserializableValues() {
     assertEquals(value, result);
   }
 
-  @Test
-  void shouldRoundtripPromiseToValue() {
+  @PlaywrightTest
+  void shouldRoundtripPromiseToValue(Page page) {
     {
       Object result = page.evaluate("value => Promise.resolve(value)", null);
       assertNull(result);
@@ -99,8 +100,8 @@ void shouldRoundtripPromiseToValue() {
     }
   }
 
-  @Test
-  void shouldRoundtripPromiseToUnserializableValues() {
+  @PlaywrightTest
+  void shouldRoundtripPromiseToUnserializableValues(Page page) {
     Map<String, ?> value = mapOf(
       "infinity", Double.POSITIVE_INFINITY,
       "nInfinity", Double.NEGATIVE_INFINITY,
@@ -111,43 +112,43 @@ void shouldRoundtripPromiseToUnserializableValues() {
     assertEquals(value, result);
   }
 
-  @Test
-  void shouldTransferArrays() {
+  @PlaywrightTest
+  void shouldTransferArrays(Page page) {
     Object result = page.evaluate("a => a", asList(1, 2, 3));
     assertEquals(asList(1, 2, 3), result);
   }
 
-  @Test
-  void shouldTransferArraysAsArraysNotObjects() {
+  @PlaywrightTest
+  void shouldTransferArraysAsArraysNotObjects(Page page) {
     Object result = page.evaluate("a => Array.isArray(a)", asList(1, 2, 3));
     assertEquals(true, result);
   }
 
-  @Test
-  void shouldTransferBigint() {
+  @PlaywrightTest
+  void shouldTransferBigint(Page page) {
     assertEquals(new BigInteger("42", 10), page.evaluate("() => 42n"));
     assertEquals(new BigInteger("17", 10), page.evaluate("a => a", new BigInteger("17", 10)));
   }
 
-  //  @Test
+  //  @PlaywrightTest
   void shouldTransferMapsAsEmptyObjects() {
     // Not applicable.
   }
 
-  @Test
-  void shouldModifyGlobalEnvironment() {
+  @PlaywrightTest
+  void shouldModifyGlobalEnvironment(Page page) {
     page.evaluate("() => window['globalVar'] = 123");
     assertEquals(123, page.evaluate("globalVar"));
   }
 
-  @Test
-  void shouldEvaluateInThePageContext() {
+  @PlaywrightTest
+  void shouldEvaluateInThePageContext(Page page, Server server) {
     page.navigate(server.PREFIX + "/global-var.html");
     assertEquals(123, page.evaluate("globalVar"));
   }
 
-  @Test
-  void shouldReturnUndefinedForObjectsWithSymbols() {
+  @PlaywrightTest
+  void shouldReturnUndefinedForObjectsWithSymbols(Page page) {
     assertEquals(singletonList(null), page.evaluate("() => [Symbol('foo4')]"));
     assertEquals(emptyMap(), page.evaluate("() => {\n" +
       "  const a = {};\n" +
@@ -163,14 +164,14 @@ void shouldWorkWithFunctionShorthands() {
     // Not applicable.
   }
 
-  @Test
-  void shouldWorkWithUnicodeChars() {
+  @PlaywrightTest
+  void shouldWorkWithUnicodeChars(Page page) {
     Object result = page.evaluate("a => a['中文字符']", mapOf("中文字符", 42));
     assertEquals(42, result);
   }
 
-  @Test
-  void shouldThrowWhenEvaluationTriggersReload() {
+  @PlaywrightTest
+  void shouldThrowWhenEvaluationTriggersReload(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evaluate("() => {\n" +
         "  location.reload();\n" +
@@ -180,14 +181,14 @@ void shouldThrowWhenEvaluationTriggersReload() {
     assertTrue(e.getMessage().contains("navigation"));
   }
 
-  @Test
-  void shouldAwaitPromise() {
+  @PlaywrightTest
+  void shouldAwaitPromise(Page page) {
     Object result = page.evaluate("() => Promise.resolve(8 * 7)");
     assertEquals(56, result);
   }
 
-  @Test
-  void shouldWorkRightAfterFramenavigated() {
+  @PlaywrightTest
+  void shouldWorkRightAfterFramenavigated(Page page, Server server) {
     Object[] frameEvaluation = {null};
     page.onFrameNavigated(frame -> {
       frameEvaluation[0] = frame.evaluate("() => 6 * 7");
@@ -196,8 +197,8 @@ void shouldWorkRightAfterFramenavigated() {
     assertEquals(42, frameEvaluation[0]);
   }
 
-  @Test
-  void shouldWorkRightAfterACrossOriginNavigation() {
+  @PlaywrightTest
+  void shouldWorkRightAfterACrossOriginNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Object[] frameEvaluation = {null};
     page.onFrameNavigated(frame -> {
@@ -207,8 +208,8 @@ void shouldWorkRightAfterACrossOriginNavigation() {
     assertEquals(42, frameEvaluation[0]);
   }
 
-  @Test
-  void shouldWorkFromInsideAnExposedFunction() {
+  @PlaywrightTest
+  void shouldWorkFromInsideAnExposedFunction(Page page) {
     // Setup inpage callback, which calls Page.evaluate
     page.exposeFunction("callController", args -> page.evaluate("({ a, b }) => a * b",
       mapOf("a", args[0], "b", args[1])));
@@ -218,58 +219,58 @@ void shouldWorkFromInsideAnExposedFunction() {
     assertEquals(27, result);
   }
 
-  @Test
-  void shouldRejectPromiseWithException() {
+  @PlaywrightTest
+  void shouldRejectPromiseWithException(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("() => not_existing_object.property"));
     assertTrue(e.getMessage().contains("not_existing_object"));
   }
 
-  @Test
-  void shouldSupportThrownStringsAsErrorMessages() {
+  @PlaywrightTest
+  void shouldSupportThrownStringsAsErrorMessages(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("() => { throw 'qwerty'; }"));
     assertTrue(e.getMessage().contains("qwerty"));
   }
 
-  @Test
-  void shouldSupportThrownNumbersAsErrorMessages() {
+  @PlaywrightTest
+  void shouldSupportThrownNumbersAsErrorMessages(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("() => { throw 100500; }"));
     assertTrue(e.getMessage().contains("100500"));
   }
 
-  @Test
-  void shouldReturnComplexObjects() {
+  @PlaywrightTest
+  void shouldReturnComplexObjects(Page page) {
     Map<String, ?> object = mapOf("foo", "bar!");
     Object result = page.evaluate("a => a", object);
     assertFalse(object == result);
     assertEquals(object, result);
   }
 
-  @Test
-  void shouldReturnNaN() {
+  @PlaywrightTest
+  void shouldReturnNaN(Page page) {
     Object result = page.evaluate("() => NaN");
     assertEquals(Double.NaN, result);
   }
 
-  @Test
-  void shouldReturn0() {
+  @PlaywrightTest
+  void shouldReturn0(Page page) {
     Object result = page.evaluate("() => -0");
     assertEquals(Double.NEGATIVE_INFINITY, 1 / (Double) result);
   }
 
-  @Test
-  void shouldReturnInfinity() {
+  @PlaywrightTest
+  void shouldReturnInfinity(Page page) {
     Object result = page.evaluate("() => Infinity");
     assertEquals(Double.POSITIVE_INFINITY, result);
   }
 
-  @Test
-  void shouldReturnNegativeInfinity() {
+  @PlaywrightTest
+  void shouldReturnNegativeInfinity(Page page) {
     Object result = page.evaluate("() => -Infinity");
     assertEquals(Double.NEGATIVE_INFINITY, result);
   }
 
-  @Test
-  void shouldWorkWithOverwrittenPromise() {
+  @PlaywrightTest
+  void shouldWorkWithOverwrittenPromise(Page page) {
     page.evaluate("() => {\n" +
       "    const originalPromise = window.Promise;\n" +
       "    class Promise2 {\n" +
@@ -322,40 +323,40 @@ void shouldAcceptUndefinedAsOneOfMultipleParameters() {
     // Not applicable
   }
 
-  @Test
+  @PlaywrightTest
   void shouldProperlySerializeUndefinedArguments() {
     // Not applicable
   }
 
-  @Test
-  void shouldProperlySerializeUndefinedFields() {
+  @PlaywrightTest
+  void shouldProperlySerializeUndefinedFields(Page page) {
     assertEquals(mapOf("a", null), page.evaluate("() => ({ a: undefined })"));
   }
 
-  @Test
-  void shouldReturnUndefinedProperties() {
+  @PlaywrightTest
+  void shouldReturnUndefinedProperties(Page page) {
     Object value = page.evaluate("() => ({ a: undefined })");
     assertEquals(mapOf("a", null), value);
   }
 
-  @Test
-  void shouldProperlySerializeNullArguments() {
+  @PlaywrightTest
+  void shouldProperlySerializeNullArguments(Page page) {
     assertEquals(null, page.evaluate("x => x", null));
   }
 
-  @Test
-  void shouldProperlySerializeNullFields() {
+  @PlaywrightTest
+  void shouldProperlySerializeNullFields(Page page) {
     assertEquals(mapOf("a", null), page.evaluate("() => ({ a: null })"));
   }
 
-  @Test
-  void shouldReturnUndefinedForNonSerializableObjects() {
+  @PlaywrightTest
+  void shouldReturnUndefinedForNonSerializableObjects(Page page) {
     assertEquals(null, page.evaluate("() => () => {}"));
     assertEquals("ref: <Window>", page.evaluate("() => window"));
   }
 
-  @Test
-  void shouldBeAbleToThrowATrickyError() {
+  @PlaywrightTest
+  void shouldBeAbleToThrowATrickyError(Page page) {
     String errorText = "My error";
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evaluate("errorText => {\n" +
@@ -365,34 +366,34 @@ void shouldBeAbleToThrowATrickyError() {
     assertTrue(e.getMessage().contains(errorText));
   }
 
-  @Test
-  void shouldAcceptAString() {
+  @PlaywrightTest
+  void shouldAcceptAString(Page page) {
     Object result = page.evaluate("1 + 2");
     assertEquals(3, result);
   }
 
-  @Test
-  void shouldAcceptAStringWithSemiColons() {
+  @PlaywrightTest
+  void shouldAcceptAStringWithSemiColons(Page page) {
     Object result = page.evaluate("1 + 5;");
     assertEquals(6, result);
   }
 
-  @Test
-  void shouldAcceptAStringWithComments() {
+  @PlaywrightTest
+  void shouldAcceptAStringWithComments(Page page) {
     Object result = page.evaluate("2 + 5;\n// do some math!");
     assertEquals(7, result);
   }
 
-  @Test
-  void shouldAcceptElementHandleAsAnArgument() {
+  @PlaywrightTest
+  void shouldAcceptElementHandleAsAnArgument(Page page) {
     page.setContent("<section>42</section>");
     ElementHandle element = page.querySelector("section");
     Object text = page.evaluate("e => e.textContent", element);
     assertEquals("42", text);
   }
 
-  @Test
-  void shouldThrowIfUnderlyingElementWasDisposed() {
+  @PlaywrightTest
+  void shouldThrowIfUnderlyingElementWasDisposed(Page page) {
     page.setContent("<section>39</section>");
     ElementHandle element = page.querySelector("section");
     assertNotNull(element);
@@ -401,8 +402,8 @@ void shouldThrowIfUnderlyingElementWasDisposed() {
     assertTrue(e.getMessage().contains("no object with guid"), e.getMessage());
   }
 
-  @Test
-  void shouldSimulateAUserGesture() {
+  @PlaywrightTest
+  void shouldSimulateAUserGesture(Page page) {
     assertEquals(true, page.evaluate("() => {\n" +
       "  document.body.appendChild(document.createTextNode('test'));\n" +
       "  document.execCommand('selectAll');\n" +
@@ -410,8 +411,8 @@ void shouldSimulateAUserGesture() {
       "}"));
   }
 
-  @Test
-  void shouldThrowANiceErrorAfterANavigation() {
+  @PlaywrightTest
+  void shouldThrowANiceErrorAfterANavigation(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForNavigation(() -> {
         page.evaluate("() => {\n" +
@@ -425,8 +426,8 @@ void shouldThrowANiceErrorAfterANavigation() {
     assertTrue(e.getMessage().contains("navigation"));
   }
 
-  @Test
-  void shouldNotThrowAnErrorWhenEvaluationDoesANavigation() {
+  @PlaywrightTest
+  void shouldNotThrowAnErrorWhenEvaluationDoesANavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/one-style.html");
     Object result = page.evaluate("() => {\n" +
       "  window.location.href = '/empty.html';\n" +
@@ -435,9 +436,9 @@ void shouldNotThrowAnErrorWhenEvaluationDoesANavigation() {
     assertEquals(asList(42), result);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="fixme")
-  void shouldNotThrowAnErrorWhenEvaluationDoesASynchronousNavigationAndReturnsAnObject() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "fixme")
+  void shouldNotThrowAnErrorWhenEvaluationDoesASynchronousNavigationAndReturnsAnObject(Page page) {
     // It is imporant to be on about:blank for sync reload.
     Object result = page.evaluate("() => {\n" +
       "  window.location.reload();\n" +
@@ -446,8 +447,8 @@ void shouldNotThrowAnErrorWhenEvaluationDoesASynchronousNavigationAndReturnsAnOb
     assertEquals(mapOf("a", 42), result);
   }
 
-  @Test
-  void shouldNotThrowAnErrorWhenEvaluationDoesASynchronousNavigationAndReturnsUndefined() {
+  @PlaywrightTest
+  void shouldNotThrowAnErrorWhenEvaluationDoesASynchronousNavigationAndReturnsUndefined(Page page) {
     // It is imporant to be on about:blank for sync reload.
     Object result = page.evaluate("() => {\n" +
       "  window.location.reload();\n" +
@@ -456,8 +457,8 @@ void shouldNotThrowAnErrorWhenEvaluationDoesASynchronousNavigationAndReturnsUnde
     assertEquals(null, result);
   }
 
-  @Test
-  void shouldTransfer100MbOfDataFromPageToNodeJs() {
+  @PlaywrightTest
+  void shouldTransfer100MbOfDataFromPageToNodeJs(Page page) {
     // This is too slow with wire.
     Object a = page.evaluate("() => Array(100 * 1024 * 1024 + 1).join('a')");
     String str = (String) a;
@@ -469,8 +470,8 @@ void shouldTransfer100MbOfDataFromPageToNodeJs() {
     }
   }
 
-  @Test
-  void shouldThrowErrorWithDetailedInformationOnExceptionInsidePromise() {
+  @PlaywrightTest
+  void shouldThrowErrorWithDetailedInformationOnExceptionInsidePromise(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evaluate("() => new Promise(() => {\n" +
         "  throw new Error('Error in promise');\n" +
@@ -479,15 +480,15 @@ void shouldThrowErrorWithDetailedInformationOnExceptionInsidePromise() {
     assertTrue(e.getMessage().contains("Error in promise"));
   }
 
-  @Test
-  void shouldWorkEvenWhenJSONIsSetToNull() {
+  @PlaywrightTest
+  void shouldWorkEvenWhenJSONIsSetToNull(Page page) {
     page.evaluate("() => { window.JSON.stringify = null; window.JSON = null; }");
     Object result = page.evaluate("() => ({ abc: 123 })");
     assertEquals(mapOf("abc", 123), result);
   }
 
-  @Test
-  void shouldAwaitPromiseFromPopup() {
+  @PlaywrightTest
+  void shouldAwaitPromiseFromPopup(Page page, Server server) {
     // Something is wrong about the way Firefox waits for the chained promise
     page.navigate(server.EMPTY_PAGE);
     Object result = page.evaluate("() => {\n" +
@@ -497,23 +498,23 @@ void shouldAwaitPromiseFromPopup() {
     assertEquals(42, result);
   }
 
-  @Test
-  void shouldWorkWithNewFunctionAndCSP() {
+  @PlaywrightTest
+  void shouldWorkWithNewFunctionAndCSP(Page page, Server server) {
     server.setCSP("/empty.html", "script-src " + server.PREFIX);
     page.navigate(server.PREFIX + "/empty.html");
     assertEquals(true, page.evaluate("() => new Function('return true')()"));
   }
 
-  @Test
-  void shouldWorkWithNonStrictExpressions() {
+  @PlaywrightTest
+  void shouldWorkWithNonStrictExpressions(Page page) {
     assertEquals(3.14, page.evaluate("() => {\n" +
       "  y = 3.14;\n" +
       "  return y;\n" +
       "}"));
   }
 
-  @Test
-  void shouldRespectUseStrictExpression() {
+  @PlaywrightTest
+  void shouldRespectUseStrictExpression(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.evaluate("() => {\n" +
         "  'use strict';\n" +
@@ -526,26 +527,26 @@ void shouldRespectUseStrictExpression() {
     assertTrue(e.getMessage().contains("variableY"));
   }
 
-  @Test
-  void shouldNotLeakUtilityScript() {
+  @PlaywrightTest
+  void shouldNotLeakUtilityScript(Page page) {
     assertEquals(true, page.evaluate("() => this === window"));
   }
 
-  @Test
-  void shouldNotLeakHandles() {
+  @PlaywrightTest
+  void shouldNotLeakHandles(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("handles.length"));
     assertTrue(e.getMessage().contains(" handles"));
   }
 
-  @Test
-  void shouldWorkWithCSP() {
+  @PlaywrightTest
+  void shouldWorkWithCSP(Page page, Server server) {
     server.setCSP("/empty.html", "script-src 'self'");
     page.navigate(server.EMPTY_PAGE);
     assertEquals(4, page.evaluate("() => 2 + 2"));
   }
 
-  @Test
-  void shouldEvaluateException() {
+  @PlaywrightTest
+  void shouldEvaluateException(Page page) {
     Exception result = (Exception) page.evaluate("() => {\n" +
       "  return (function functionOnStack() {\n" +
       "    return new Error('error message');\n" +
@@ -555,14 +556,14 @@ void shouldEvaluateException() {
     assertTrue(result.getMessage().contains("functionOnStack"), result.getMessage());
   }
 
-  @Test
-  void shouldEvaluateException2() {
+  @PlaywrightTest
+  void shouldEvaluateException2(Page page) {
     Exception error = (Exception) page.evaluate("new Error('error message')");
     assertTrue(error.getMessage().contains("Error: error message"), error.getMessage());
   }
 
-  @Test
-  void shouldPassExceptionArgument() {
+  @PlaywrightTest
+  void shouldPassExceptionArgument(Page page) {
     Exception e = new Exception("error message");
     Map<String, Object> received = (Map<String, Object>) page.evaluate("e => { return { message: e.message, name: e.name, stack: e.stack }; }", e);
 
@@ -572,23 +573,23 @@ void shouldPassExceptionArgument() {
     assertTrue(received.get("stack").toString().contains("shouldPassExceptionArgument"), received.get("stack").toString());
   }
 
-  @Test
-  void shouldEvaluateDate() {
+  @PlaywrightTest
+  void shouldEvaluateDate(Page page) {
     Object result = page.evaluate("() => ({ date: new Date('2020-05-27T01:31:38.506Z') })");
     Date expected = Date.from(ZonedDateTime.parse("2020-05-27T01:31:38.506Z").toInstant());
     assertEquals(mapOf("date", expected), result);
   }
 
-  @Test
-  void shouldRoundtripDate() {
+  @PlaywrightTest
+  void shouldRoundtripDate(Page page) {
     Date date = Date.from(ZonedDateTime.parse("2020-05-27T01:31:38.506Z").toInstant());
     Object result = page.evaluate("date => date", date);
     assertTrue(result instanceof Date);
     assertEquals(date.toString(), result.toString());
   }
 
-  @Test
-  void shouldRoundtripRegex() {
+  @PlaywrightTest
+  void shouldRoundtripRegex(Page page) {
     Pattern regex = Pattern.compile("hello", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
     Object result = page.evaluate("regex => regex", regex);
     assertTrue(result instanceof Pattern);
@@ -596,54 +597,54 @@ void shouldRoundtripRegex() {
     assertEquals(regex.flags(), ((Pattern)result).flags());
   }
 
-  @Test
-  void shouldJsonValueDate() {
+  @PlaywrightTest
+  void shouldJsonValueDate(Page page) {
     JSHandle resultHandle = page.evaluateHandle("() => ({ date: new Date('2020-05-27T01:31:38.506Z') })");
     assertEquals(mapOf("date", Date.from(ZonedDateTime.parse("2020-05-27T01:31:38.506Z").toInstant())), resultHandle.jsonValue());
   }
 
-  @Test
-  void shouldEvaluateUrl() throws MalformedURLException {
+  @PlaywrightTest
+  void shouldEvaluateUrl(Page page) throws MalformedURLException {
     Object result = page.evaluate("() => ({ url: new URL('https://example.com/') })");
     assertEquals(mapOf("url", new URL("https://example.com/")), result);
   }
 
-  @Test
-  void shouldRoundtripUrl() throws MalformedURLException {
+  @PlaywrightTest
+  void shouldRoundtripUrl(Page page) throws MalformedURLException {
     URL url = new URL("https://example.com/");
     Object result = page.evaluate("url => url", url);
     assertTrue(result instanceof URL);
     assertEquals(url.toString(), result.toString());
   }
 
-  @Test
-  void shouldRoundtripComplexUrl() throws MalformedURLException {
+  @PlaywrightTest
+  void shouldRoundtripComplexUrl(Page page) throws MalformedURLException {
     URL url = new URL("https://user:password@www.contoso.com:80/Home/Index.htm?q1=v1&q2=v2#FragmentName");
     Object result = page.evaluate("url => url", url);
     assertTrue(result instanceof URL);
     assertEquals(url.toString(), result.toString());
   }
 
-  @Test
-  void shouldNotUseToJSONWhenEvaluating() {
+  @PlaywrightTest
+  void shouldNotUseToJSONWhenEvaluating(Page page) {
     Object result = page.evaluate("() => ({ toJSON: () => 'string', data: 'data' })");
     assertEquals(mapOf("data", "data", "toJSON", emptyMap()), result);
   }
 
-  @Test
-  void shouldNotUseToJSONInJsonValue() {
+  @PlaywrightTest
+  void shouldNotUseToJSONInJsonValue(Page page) {
     JSHandle resultHandle = page.evaluateHandle("() => ({ toJSON: () => 'string', data: 'data' })");
     assertEquals(mapOf("data", "data", "toJSON", emptyMap()), resultHandle.jsonValue());
   }
 
-  @Test
-  void shouldAliasWindowDocumentAndNode() {
+  @PlaywrightTest
+  void shouldAliasWindowDocumentAndNode(Page page) {
     Object object = page.evaluate("[window, document, document.body]");
     assertEquals(asList("ref: <Window>", "ref: <Document>", "ref: <Node>"), object);
   }
 
-  @Test
-  void shouldWorkForCircularObject() {
+  @PlaywrightTest
+  void shouldWorkForCircularObject(Page page) {
     Object result = page.evaluate("() => {\n" +
       "    const a = {};\n" +
       "    a.b = a;\n" +
@@ -655,8 +656,8 @@ void shouldWorkForCircularObject() {
     assertTrue(map == map.get("b"));
   }
 
-  @Test
-  void shouldAcceptParameter() {
+  @PlaywrightTest
+  void shouldAcceptParameter(Page page) {
     Instant instant = Instant.now();
     LocalDateTime localDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
     Object object = page.evaluate("p => p", localDateTime);
@@ -664,13 +665,13 @@ void shouldAcceptParameter() {
     assertEquals(Date.from(instant), object);
   }
 
-  @Test
-  void shouldTransferMaps() {
+  @PlaywrightTest
+  void shouldTransferMaps(Page page) {
     assertEquals(mapOf(), page.evaluate("() => new Map([[1, { test: 42n }]])"));
   }
 
-  @Test
-  void shouldTransferSets() {
+  @PlaywrightTest
+  void shouldTransferSets(Page page) {
     assertEquals(mapOf(), page.evaluate("() => new Set([1, { test: 42n }])"));
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java
index 8b4b0b2fc..75663abff 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventConsole.java
@@ -16,26 +16,30 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.ConsoleMessagesFilter;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.OS;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static com.microsoft.playwright.Utils.getOS;
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageEventConsole extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageEventConsole {
+  @PlaywrightTest
+  void shouldWork(Page page, BrowserName browserName) {
     ConsoleMessage[] event = {null};
     page.onConsoleMessage(m -> event[0] = m);
     ConsoleMessage message = page.waitForConsoleMessage(() -> page.evaluate("() => console.log('hello', 5, {foo: 'bar'});"));
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals("hello 5 JSHandle@object", message.text());
     } else {
       assertEquals("hello 5 {foo: bar}", message.text());
@@ -47,16 +51,16 @@ void shouldWork() {
     assertEquals(message, event[0]);
   }
 
-  @Test
-  void shouldEmitSameLogTwice() {
+  @PlaywrightTest
+  void shouldEmitSameLogTwice(Page page) {
     List<String> messages = new ArrayList<>();
     page.onConsoleMessage(m -> messages.add(m.text()));
     page.evaluate("() => { for (let i = 0; i < 2; ++i) console.log('hello'); }");
     assertEquals(asList("hello", "hello"), messages);
   }
 
-  @Test
-  void shouldWorkForDifferentConsoleAPICalls() {
+  @PlaywrightTest
+  void shouldWorkForDifferentConsoleAPICalls(Page page) {
     List<ConsoleMessage> messages = new ArrayList<>();
     page.onConsoleMessage(msg -> messages.add(msg));
     // All console events will be reported before "page.evaluate" is finished.
@@ -82,23 +86,19 @@ void shouldWorkForDifferentConsoleAPICalls() {
       "Promise"), messages.subList(1, messages.size()).stream().map(msg -> msg.text()).collect(toList()));
   }
 
-  @Test
-  void shouldNotFailForWindowObject() {
+  @PlaywrightTest
+  void shouldNotFailForWindowObject(Page page, BrowserName browserName) {
     ConsoleMessage message = page.waitForConsoleMessage(() -> page.evaluate("console.error(window)"));
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals("JSHandle@object", message.text());
     } else {
       assertEquals("Window", message.text());
     }
   }
 
-  static boolean isWebKitWindows() {
-    return isWebKit() && getOS() == Utils.OS.WINDOWS;
-  }
-
-  @Test
-  @DisabledIf(value="isWebKitWindows", disabledReason="Upstream issue https://bugs.webkit.org/show_bug.cgi?id=229515")
-  void shouldTriggerCorrectLog() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, os = OS.WINDOWS, reason = "Upstream issue https://bugs.webkit.org/show_bug.cgi?id=229515")
+  void shouldTriggerCorrectLog(Page page, Server server) {
     page.navigate("about:blank");
     ConsoleMessage message = page.waitForConsoleMessage(() -> {
       page.evaluate("async url => fetch(url).catch(e => {})", server.EMPTY_PAGE);
@@ -107,8 +107,8 @@ void shouldTriggerCorrectLog() {
     assertEquals("error", message.type());
   }
 
-  @Test
-  void shouldHaveLocationForConsoleAPICalls() {
+  @PlaywrightTest
+  void shouldHaveLocationForConsoleAPICalls(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     ConsoleMessage message = page.waitForConsoleMessage(
       new Page.WaitForConsoleMessageOptions().setPredicate(m -> "yellow".equals(m.text())),
@@ -118,8 +118,8 @@ void shouldHaveLocationForConsoleAPICalls() {
     assertTrue(message.location().startsWith(server.PREFIX + "/consolelog.html:7:"), message.location());
   }
 
-  @Test
-  void shouldSupportPredicate() {
+  @PlaywrightTest
+  void shouldSupportPredicate(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     ConsoleMessage message = page.waitForConsoleMessage(
       new Page.WaitForConsoleMessageOptions().setPredicate(m -> "info".equals(m.type())),
@@ -131,8 +131,8 @@ void shouldSupportPredicate() {
     assertEquals("info", message.type());
   }
 
-  @Test
-  void consoleMessagesShouldWork() {
+  @PlaywrightTest
+  void consoleMessagesShouldWork(Page page) {
     page.evaluate("() => {\n" +
       "  for (let i = 0; i < 301; i++)\n" +
       "    console.log('message' + i);\n" +
@@ -150,8 +150,8 @@ void consoleMessagesShouldWork() {
     }
   }
 
-  @Test
-  void shouldHaveTimestamp() {
+  @PlaywrightTest
+  void shouldHaveTimestamp(Page page) {
     double before = (double) System.currentTimeMillis() - 1;
     ConsoleMessage message = page.waitForConsoleMessage(
       () -> page.evaluate("() => console.log('timestamp test')"));
@@ -162,8 +162,8 @@ void shouldHaveTimestamp() {
       "timestamp " + message.timestamp() + " should be <= " + after);
   }
 
-  @Test
-  void shouldHaveIncreasingTimestamps() {
+  @PlaywrightTest
+  void shouldHaveIncreasingTimestamps(Page page) {
     List<ConsoleMessage> messages = new ArrayList<>();
     page.onConsoleMessage(messages::add);
     page.evaluate("() => { console.log('first'); console.log('second'); console.log('third'); }");
@@ -172,8 +172,8 @@ void shouldHaveIncreasingTimestamps() {
       assertTrue(messages.get(i).timestamp() >= messages.get(i - 1).timestamp());
   }
 
-  @Test
-  void clearConsoleMessagesShouldWork() {
+  @PlaywrightTest
+  void clearConsoleMessagesShouldWork(Page page) {
     page.evaluate("() => { console.log('message1'); console.log('message2'); }");
     List<ConsoleMessage> messages = page.consoleMessages();
     assertTrue(messages.stream().anyMatch(m -> "message1".equals(m.text())));
@@ -189,8 +189,8 @@ void clearConsoleMessagesShouldWork() {
     assertEquals("message3", messages.get(0).text());
   }
 
-  @Test
-  void consoleMessagesSinceNavigationFilterShouldWork() {
+  @PlaywrightTest
+  void consoleMessagesSinceNavigationFilterShouldWork(Page page, Server server) {
     page.evaluate("() => console.log('before navigation')");
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("() => console.log('after navigation')");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventNetwork.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventNetwork.java
index f796f045c..61799f6f4 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventNetwork.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventNetwork.java
@@ -16,17 +16,23 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
+import static com.microsoft.playwright.fixtures.Env.isMac;
+import static com.microsoft.playwright.fixtures.Env.isWindows;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageEventNetwork extends TestBase {
-  @Test
-  void PageEventsRequest() {
+public class TestPageEventNetwork {
+  @PlaywrightTest
+  void PageEventsRequest(Page page, Server server) {
     List<Request> requests = new ArrayList<>();
     page.onRequest(request -> requests.add(request));
     page.navigate(server.EMPTY_PAGE);
@@ -39,8 +45,8 @@ void PageEventsRequest() {
     assertEquals(server.EMPTY_PAGE, requests.get(0).frame().url());
   }
 
-  @Test
-  void PageEventsResponse() {
+  @PlaywrightTest
+  void PageEventsResponse(Page page, Server server) {
     List<Response> responses = new ArrayList<>();
     page.onResponse(response -> responses.add(response));
     page.navigate(server.EMPTY_PAGE);
@@ -51,14 +57,14 @@ void PageEventsResponse() {
     assertNotNull(responses.get(0).request());
   }
 
-  @Test
-  void PageEventsRequestFailed() {
+  @PlaywrightTest
+  void PageEventsRequestFailed(Page page, Server server, BrowserName browserName) {
     server.setRoute("/one-style.css", exchange -> exchange.getResponseBody().close());
     List<Request> failedRequests = new ArrayList<>();
     page.onRequestFailed(request -> failedRequests.add(request));
     page.navigate(server.PREFIX + "/one-style.html");
     // In firefox one-style.css is requested multiple times.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertTrue(failedRequests.size() > 0);
     } else {
       assertEquals(1, failedRequests.size());
@@ -67,9 +73,9 @@ void PageEventsRequestFailed() {
     assertNull(failedRequests.get(0).response());
     assertEquals("stylesheet", failedRequests.get(0).resourceType());
     String error = failedRequests.get(0).failure();
-    if (isChromium()) {
+    if (browserName == CHROMIUM) {
       assertEquals("net::ERR_EMPTY_RESPONSE", error);
-    } else if (isWebKit()) {
+    } else if (browserName == WEBKIT) {
       if (isMac)
         assertEquals("The network connection was lost.", error);
       else if (isWindows)
@@ -82,8 +88,8 @@ else if (isWindows)
     assertNotNull(failedRequests.get(0).frame());
   }
 
-  @Test
-  void PageEventsRequestFinished() {
+  @PlaywrightTest
+  void PageEventsRequestFinished(Page page, Server server) {
     Request[] requestRef = {null};
     page.onRequestFinished(r -> requestRef[0] = r);
     Response response = page.navigate(server.EMPTY_PAGE);
@@ -99,8 +105,8 @@ void PageEventsRequestFinished() {
     assertNull(request.failure());
   }
 
-  @Test
-  void PageWaitForRequestFinished() {
+  @PlaywrightTest
+  void PageWaitForRequestFinished(Page page, Server server) {
     Response[] responseRef = {null};
     Request request = page.waitForRequestFinished(() -> {
       responseRef[0] = page.navigate(server.EMPTY_PAGE);
@@ -117,8 +123,8 @@ void PageWaitForRequestFinished() {
     assertNull(request.failure());
   }
 
-  @Test
-  void shouldFireEventsInProperOrder() {
+  @PlaywrightTest
+  void shouldFireEventsInProperOrder(Page page, Server server) {
     List<String> events = new ArrayList<>();
     page.onRequest(request -> events.add("request"));
     page.onResponse(response -> events.add("response"));
@@ -128,8 +134,8 @@ void shouldFireEventsInProperOrder() {
     assertEquals(asList("request", "response", "requestfinished"), events);
   }
 
-  @Test
-  void shouldSupportRedirects() {
+  @PlaywrightTest
+  void shouldSupportRedirects(Page page, Server server) {
     List<String> events = new ArrayList<>();
     page.onRequest(request -> {
       events.add(request.method() + " " + request.url());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
index f90f895f7..4742c6d68 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java
@@ -16,16 +16,16 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestPageEventPageError extends TestBase {
-  @Test
-  void pageErrorsShouldWork() {
+public class TestPageEventPageError {
+  @PlaywrightTest
+  void pageErrorsShouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("async () => {\n" +
       "    for (let i = 0; i < 301; i++)\n" +
@@ -44,8 +44,8 @@ void pageErrorsShouldWork() {
     }
   }
 
-  @Test
-  void clearPageErrorsShouldWork() {
+  @PlaywrightTest
+  void clearPageErrorsShouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("async () => {\n" +
       "  window.setTimeout(() => { throw new Error('error1'); }, 0);\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPopup.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPopup.java
index 2296b7879..05726b3cd 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventPopup.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventPopup.java
@@ -16,13 +16,13 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageEventPopup extends TestBase {
-  @Test
-  void shouldWorkWithClickingTarget_blank() {
+public class TestPageEventPopup {
+  @PlaywrightTest
+  void shouldWorkWithClickingTarget_blank(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a target=_blank rel='opener' href='/one-style.html'>yo</a>");
     Page popup = page.waitForPopup(() -> page.click("a"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageEventRequest.java b/playwright/src/test/java/com/microsoft/playwright/TestPageEventRequest.java
index 8a2549fc5..ec8666d98 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageEventRequest.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageEventRequest.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageEventRequest extends TestBase {
-  @Test
-  void shouldReturnLastRequests() throws ExecutionException, InterruptedException {
+public class TestPageEventRequest {
+  @PlaywrightTest
+  void shouldReturnLastRequests(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.PREFIX + "/title.html");
 
     // Set up routes for 200 requests
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
index 40bd7cc63..4996e6ca8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageExposeFunction.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.BindingCallback;
-import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -26,10 +26,10 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageExposeFunction extends TestBase {
+public class TestPageExposeFunction {
 
-  @Test
-  void exposeBindingShouldWork() {
+  @PlaywrightTest
+  void exposeBindingShouldWork(Browser browser) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     BindingCallback.Source[] bindingSource = { null };
@@ -47,8 +47,8 @@ void exposeBindingShouldWork() {
     context.close();
   }
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     page.exposeFunction("compute", args -> (Integer) args[0] * (Integer) args[1]);
     Object result = page.evaluate("async function() {\n" +
       "  return await window['compute'](9, 4);\n" +
@@ -56,8 +56,8 @@ void shouldWork() {
     assertEquals(36, result);
   }
 
-  @Test
-  void shouldWorkWithHandlesAndComplexObjects() {
+  @PlaywrightTest
+  void shouldWorkWithHandlesAndComplexObjects(Page page) {
    JSHandle fooHandle = page.evaluateHandle("() => {\n" +
      "  window['fooValue'] = { bar: 2 };\n" +
      "  return window['fooValue'];\n" +
@@ -72,8 +72,8 @@ void shouldWorkWithHandlesAndComplexObjects() {
   }
 
 
-  @Test
-  void shouldThrowExceptionInPageContext() {
+  @PlaywrightTest
+  void shouldThrowExceptionInPageContext(Page page) {
     page.exposeFunction("woof", args -> {
       throw new RuntimeException("WOOF WOOF");
     });
@@ -94,8 +94,8 @@ void shouldThrowExceptionInPageContext() {
   void shouldSupportThrowingNull() {
     // Throwing null would lead to NullPointerException in Java.
   }
-  @Test
-  void shouldBeCallableFromInsideAddInitScript() {
+  @PlaywrightTest
+  void shouldBeCallableFromInsideAddInitScript(Page page) {
     boolean[] called = { false };
     page.exposeFunction("woof", args -> called[0] = true);
     page.addInitScript("window['woof']()");
@@ -103,8 +103,8 @@ void shouldBeCallableFromInsideAddInitScript() {
     assertTrue(called[0]);
   }
 
-  @Test
-  void shouldSurviveNavigation() {
+  @PlaywrightTest
+  void shouldSurviveNavigation(Page page, Server server) {
     page.exposeFunction("compute", args -> (Integer) args[0] * (Integer) args[1]);
     Object result = page.evaluate("async function() {\n" +
       "  return await window['compute'](9, 4);\n" +
@@ -116,8 +116,8 @@ void shouldSurviveNavigation() {
   void shouldAwaitReturnedPromise() {
     // Java callback cannot return promise.
   }
-  @Test
-  void shouldWorkOnFrames() {
+  @PlaywrightTest
+  void shouldWorkOnFrames(Page page, Server server) {
     page.exposeFunction("compute", args -> (Integer) args[0] * (Integer) args[1]);
     page.navigate(server.PREFIX + "/frames/nested-frames.html");
     Frame frame = page.frames().get(1);
@@ -127,8 +127,8 @@ void shouldWorkOnFrames() {
     assertEquals(15, result);
   }
 
-  @Test
-  void shouldWorkOnFramesBeforeNavigation() {
+  @PlaywrightTest
+  void shouldWorkOnFramesBeforeNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/nested-frames.html");
     page.exposeFunction("compute", args -> (Integer) args[0] * (Integer) args[1]);
 
@@ -139,8 +139,8 @@ void shouldWorkOnFramesBeforeNavigation() {
     assertEquals(15, result);
   }
 
-  @Test
-  void shouldWorkAfterCrossOriginNavigation() {
+  @PlaywrightTest
+  void shouldWorkAfterCrossOriginNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.exposeFunction("compute", args -> (Integer) args[0] * (Integer) args[1]);
 
@@ -149,8 +149,8 @@ void shouldWorkAfterCrossOriginNavigation() {
     assertEquals(36, result);
   }
 
-  @Test
-  void shouldWorkWithComplexObjects() {
+  @PlaywrightTest
+  void shouldWorkWithComplexObjects(Page page) {
     page.exposeFunction("complexObject", args -> {
       @SuppressWarnings("unchecked")
       Map<String, Integer> a = (Map<String, Integer>) args[0];
@@ -164,8 +164,8 @@ void shouldWorkWithComplexObjects() {
     assertEquals( 7, ((Map) result).get("x"));
   }
 
-  @Test
-  void shouldThrowForDuplicateRegistrations() {
+  @PlaywrightTest
+  void shouldThrowForDuplicateRegistrations(Page page) {
     page.exposeFunction("foo", args -> null);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.exposeFunction("foo", args -> null);
@@ -173,8 +173,8 @@ void shouldThrowForDuplicateRegistrations() {
     assertTrue(e.getMessage().contains("Function \"foo\" has been already registered"));
   }
 
-  @Test
-  void shouldSerializeCycles() {
+  @PlaywrightTest
+  void shouldSerializeCycles(Page page) {
     Object[] object = { null };
     page.exposeBinding("log", (source, obj) -> object[0] = obj[0]);
     page.evaluate("const a = {}; a.b = a; window.log(a)");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageFill.java b/playwright/src/test/java/com/microsoft/playwright/TestPageFill.java
index c949a4415..ad3001601 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageFill.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageFill.java
@@ -16,30 +16,32 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageFill extends TestBase {
+public class TestPageFill {
 
-  @Test
-  void shouldFillTextarea() {
+  @PlaywrightTest
+  void shouldFillTextarea(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.fill("textarea", "some value");
     assertEquals("some value", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldFillInput() {
+  @PlaywrightTest
+  void shouldFillInput(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.fill("input", "some value");
     assertEquals("some value", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void shouldThrowOnUnsupportedInputs() {
+  @PlaywrightTest
+  void shouldThrowOnUnsupportedInputs(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     for (String type : new String[]{"button", "checkbox", "file", "image", "radio", "reset", "submit"}) {
       page.evalOnSelector("input", "(input, type) => input.setAttribute('type', type)", type);
@@ -48,15 +50,15 @@ void shouldThrowOnUnsupportedInputs() {
     }
   }
 
-  @Test
-  void shouldFillRangeInput() {
+  @PlaywrightTest
+  void shouldFillRangeInput(Page page) {
     page.setContent("<input type=range min=0 max=100 value=50>");
     page.fill("input", "42");
     assertEquals("42", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  void shouldThrowOnIncorrectRangeValue() {
+  @PlaywrightTest
+  void shouldThrowOnIncorrectRangeValue(Page page) {
     page.setContent("<input type=range min=0 max=100 value=50>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.fill("input", "foo"));
     assertTrue(e.getMessage().contains("Malformed value"), e.getMessage());
@@ -69,8 +71,8 @@ void shouldThrowOnIncorrectRangeValue() {
   }
 
 
-  @Test
-  void shouldFillDifferentInputTypes() {
+  @PlaywrightTest
+  void shouldFillDifferentInputTypes(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     for (String type : new String[]{"password", "search", "tel", "text", "url"}) {
       page.evalOnSelector("input", "(input, type) => input.setAttribute('type', type)", type);
@@ -79,61 +81,61 @@ void shouldFillDifferentInputTypes() {
     }
   }
 
-  @Test
-  void shouldFillDateInputAfterClicking() {
+  @PlaywrightTest
+  void shouldFillDateInputAfterClicking(Page page) {
     page.setContent("<input type=date>");
     page.click("input");
     page.fill("input", "2020-03-02");
     assertEquals("2020-03-02", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="skip")
-  void shouldThrowOnIncorrectDate() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "skip")
+  void shouldThrowOnIncorrectDate(Page page) {
     page.setContent("<input type=date>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.fill("input", "2020-13-05"));
     assertTrue(e.getMessage().contains("Malformed value"));
   }
 
-  @Test
-  void shouldFillTimeInput() {
+  @PlaywrightTest
+  void shouldFillTimeInput(Page page) {
     page.setContent("<input type=time>");
     page.fill("input", "13:15");
     assertEquals("13:15", page.evalOnSelector("input", "input => input.value"));
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="skip")
-  void shouldThrowOnIncorrectTime() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "skip")
+  void shouldThrowOnIncorrectTime(Page page) {
     page.setContent("<input type=time>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.fill("input", "25:05"));
     assertTrue(e.getMessage().contains("Malformed value"));
   }
 
-  @Test
-  void shouldFillDatetimeLocalInput() {
+  @PlaywrightTest
+  void shouldFillDatetimeLocalInput(Page page) {
     page.setContent("<input type=datetime-local>");
     page.fill("input", "2020-03-02T05:15");
     assertEquals(page.evalOnSelector("input", "input => input.value"), "2020-03-02T05:15");
   }
 
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="skip")
-  void shouldThrowOnIncorrectDatetimeLocal() {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = CHROMIUM, reason = "skip")
+  void shouldThrowOnIncorrectDatetimeLocal(Page page) {
     page.setContent("<input type=datetime-local>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.fill("input", "abc"));
     assertTrue(e.getMessage().contains("Malformed value"));
   }
 
-  @Test
-  void shouldFillContenteditable() {
+  @PlaywrightTest
+  void shouldFillContenteditable(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.fill("div[contenteditable]", "some value");
     assertEquals(page.evalOnSelector("div[contenteditable]", "div => div.textContent"), "some value");
   }
 
-  @Test
-  void shouldFillElementsWithExistingValueAndSelection() {
+  @PlaywrightTest
+  void shouldFillElementsWithExistingValueAndSelection(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
 
     page.evalOnSelector("input", "input => input.value = 'value one'");
@@ -159,8 +161,8 @@ void shouldFillElementsWithExistingValueAndSelection() {
     assertEquals("replace with this", page.evalOnSelector("div[contenteditable]", "div => div.textContent"));
   }
 
-  @Test
-  void shouldThrowWhenElementIsNotAnInputTextareaOrContenteditable() {
+  @PlaywrightTest
+  void shouldThrowWhenElementIsNotAnInputTextareaOrContenteditable(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.fill("body", ""));
     assertTrue(e.getMessage().contains("Element is not an <input>"));
@@ -175,22 +177,22 @@ void shouldRetryOnDisabledElement() {
   }
   void shouldRetryOnInvisibleElement() {
   }
-  @Test
-  void shouldBeAbleToFillTheBody() {
+  @PlaywrightTest
+  void shouldBeAbleToFillTheBody(Page page) {
     page.setContent("<body contentEditable='true'></body>");
     page.fill("body", "some value");
     assertEquals("some value", page.evaluate("() => document.body.textContent"));
   }
 
-  @Test
-  void shouldFillFixedPositionInput() {
+  @PlaywrightTest
+  void shouldFillFixedPositionInput(Page page) {
     page.setContent("<input style='position: fixed;' />");
     page.fill("input", "some value");
     assertEquals("some value", page.evaluate("() => document.querySelector('input').value"));
   }
 
-  @Test
-  void shouldBeAbleToFillWhenFocusIsInTheWrongFrame() {
+  @PlaywrightTest
+  void shouldBeAbleToFillWhenFocusIsInTheWrongFrame(Page page) {
     page.setContent("<div contentEditable='true'></div>\n" +
       "<iframe></iframe>");
     page.focus("iframe");
@@ -198,36 +200,36 @@ void shouldBeAbleToFillWhenFocusIsInTheWrongFrame() {
     assertEquals("some value", page.evalOnSelector("div", "d => d.textContent"));
   }
 
-  @Test
-  void shouldBeAbleToFillTheInputTypeNumber() {
+  @PlaywrightTest
+  void shouldBeAbleToFillTheInputTypeNumber(Page page) {
     page.setContent("<input id='input' type='number'></input>");
     page.fill("input", "42");
     assertEquals("42", page.evaluate("() => window['input'].value"));
   }
 
-  @Test
-  void shouldBeAbleToFillExponentIntoTheInputTypeNumber() {
+  @PlaywrightTest
+  void shouldBeAbleToFillExponentIntoTheInputTypeNumber(Page page) {
     page.setContent("<input id='input' type='number'></input>");
     page.fill("input", "-10e5");
     assertEquals("-10e5", page.evaluate("() => window['input'].value"));
   }
 
-  @Test
-  void shouldBeAbleToFillInputTypeNumberWithEmptyString() {
+  @PlaywrightTest
+  void shouldBeAbleToFillInputTypeNumberWithEmptyString(Page page) {
     page.setContent("<input id='input' type='number' value='123'></input>");
     page.fill("input", "");
     assertEquals("", page.evaluate("() => window['input'].value"));
   }
 
-  @Test
-  void shouldNotBeAbleToFillTextIntoTheInputTypeNumber() {
+  @PlaywrightTest
+  void shouldNotBeAbleToFillTextIntoTheInputTypeNumber(Page page) {
     page.setContent("<input id='input' type='number'></input>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.fill("input", "abc"));
     assertTrue(e.getMessage().contains("Cannot type text into input[type=number]"));
   }
 
-  @Test
-  void shouldBeAbleToClear() {
+  @PlaywrightTest
+  void shouldBeAbleToClear(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.fill("input", "some value");
     assertEquals("some value", page.evaluate("() => window['result']"));
@@ -235,8 +237,8 @@ void shouldBeAbleToClear() {
     assertEquals("", page.evaluate("() => window['result']"));
   }
 
-  @Test
-  void inputValueShouldWork() {
+  @PlaywrightTest
+  void inputValueShouldWork(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.fill("input", "my-text-content");
     assertEquals("my-text-content", page.inputValue("input"));
@@ -244,8 +246,8 @@ void inputValueShouldWork() {
     assertEquals("", page.inputValue("input"));
   }
 
-  @Test
-  void shouldBeAbleToClearUsingFill() {
+  @PlaywrightTest
+  void shouldBeAbleToClearUsingFill(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.fill("input", "some value");
     assertEquals("some value", page.evaluate("() => window['result']"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java b/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java
index b0d766c95..a1b273800 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageInterception.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.impl.PlaywrightImpl;
 
 import java.util.HashMap;
@@ -25,11 +25,12 @@
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class  TestPageInterception extends TestBase {
-  @Test
-  void shouldWorkWithNavigationSmoke() {
+public class  TestPageInterception {
+  @PlaywrightTest
+  void shouldWorkWithNavigationSmoke(Page page, Server server) {
     HashMap<String, Request> requests = new HashMap<>();
     page.route("**/*", route -> {
       String[] parts = route.request().url().split("/");
@@ -44,8 +45,8 @@ void shouldWorkWithNavigationSmoke() {
     assertFalse(requests.get("style.css").isNavigationRequest());
   }
 
-  @Test
-  void shouldInterceptAfterAServiceWorker() {
+  @PlaywrightTest
+  void shouldInterceptAfterAServiceWorker(Page page, Server server, BrowserName browserName) {
     page.navigate(server.PREFIX + "/serviceworkers/fetchdummy/sw.html");
     page.evaluate("() => window['activationPromise']");
 
@@ -70,7 +71,7 @@ void shouldInterceptAfterAServiceWorker() {
     assertEquals("FAILURE: Not Found", nonInterceptedResponse);
 
     // Firefox does not want to fetch the redirect for some reason.
-    if (!isFirefox()) {
+    if (browserName != FIREFOX) {
       // Page route is not applied to service worker initiated fetch with redirect.
       server.setRedirect("/serviceworkers/fetchdummy/passthrough", "/simple.json");
       Object redirectedResponse = page.evaluate("() => window['fetchDummy']('passthrough')");
@@ -78,8 +79,8 @@ void shouldInterceptAfterAServiceWorker() {
     }
   }
 
-  @Test
-  void shouldFulfillInterceptedResponseUsingAlias() {
+  @PlaywrightTest
+  void shouldFulfillInterceptedResponseUsingAlias(Page page, Server server) {
     page.route("**/*", route -> {
       APIResponse response = route.fetch();
       route.fulfill(new Route.FulfillOptions().setResponse(response));
@@ -89,8 +90,8 @@ void shouldFulfillInterceptedResponseUsingAlias() {
     assertTrue(response.headers().get("content-type").contains("text/html"));
   }
 
-  @Test
-  void shouldSupportTimeoutOptionInRouteFetch() {
+  @PlaywrightTest
+  void shouldSupportTimeoutOptionInRouteFetch(Page page, Server server) {
     server.setRoute("/slow", exchange -> {
       exchange.getResponseHeaders().set("Content-type", "text/plain");
       exchange.sendResponseHeaders(200, 4096);
@@ -106,8 +107,8 @@ void shouldSupportTimeoutOptionInRouteFetch() {
     assertTrue(error.getMessage().contains("Timeout 2000ms exceeded"), error.getMessage());
   }
 
-  @Test
-  void shouldInterceptWithUrlOverride() {
+  @PlaywrightTest
+  void shouldInterceptWithUrlOverride(Page page, Server server) {
     page.route("**/*.html", route -> {
       APIResponse response = route.fetch(new Route.FetchOptions().setUrl(server.PREFIX + "/one-style.html"));
       route.fulfill(new Route.FulfillOptions().setResponse(response));
@@ -117,8 +118,8 @@ void shouldInterceptWithUrlOverride() {
     assertTrue(response.text().contains("one-style.css"), response.text());
   }
 
-  @Test
-  void shouldInterceptWithPostDataOverride() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldInterceptWithPostDataOverride(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/empty.html");
     page.route("**/*.html", route -> {
       APIResponse response = route.fetch(new Route.FetchOptions().setPostData("{ \"foo\": \"bar\" }"));
@@ -128,8 +129,8 @@ void shouldInterceptWithPostDataOverride() throws ExecutionException, Interrupte
     assertEquals("{ \"foo\": \"bar\" }", new String(request.get().postBody));
   }
 
-  @Test
-  void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0InRouteFetch() {
+  @PlaywrightTest
+  void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0InRouteFetch(Page page, Server server) {
     server.setRedirect("/foo", "/empty.html");
     page.route("**/*", route -> {
       APIResponse response = route.fetch(new Route.FetchOptions().setMaxRedirects(0));
@@ -141,108 +142,108 @@ void shouldNotFollowRedirectsWhenMaxRedirectsIsSetTo0InRouteFetch() {
     assertTrue(page.content().contains("hello"));
   }
 
-  @Test
-  void shouldWorkWithGlob() {
-    assertTrue(globToRegex("**/*.js").matcher("https://localhost:8080/foo.js").find());
-    assertFalse(globToRegex("**/*.css").matcher("https://localhost:8080/foo.js").find());
-    assertFalse(globToRegex("*.js").matcher("https://localhost:8080/foo.js").find());
-    assertTrue(globToRegex("https://**/*.js").matcher("https://localhost:8080/foo.js").find());
-    assertTrue(globToRegex("http://localhost:8080/simple/path.js").matcher("http://localhost:8080/simple/path.js").find());
-    assertTrue(globToRegex("**/{a,b}.js").matcher("https://localhost:8080/a.js").find());
-    assertTrue(globToRegex("**/{a,b}.js").matcher("https://localhost:8080/b.js").find());
-    assertFalse(globToRegex("**/{a,b}.js").matcher("https://localhost:8080/c.js").find());
-
-    assertTrue(globToRegex("**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.jpg").find());
-    assertTrue(globToRegex("**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.jpeg").find());
-    assertTrue(globToRegex("**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.png").find());
-    assertFalse(globToRegex("**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.css").find());
-    assertTrue(globToRegex("foo*").matcher("foo.js").find());
-    assertFalse(globToRegex("foo*").matcher("foo/bar.js").find());
-    assertFalse(globToRegex("http://localhost:3000/signin-oidc*").matcher("http://localhost:3000/signin-oidc/foo").find());
-    assertTrue(globToRegex("http://localhost:3000/signin-oidc*").matcher("http://localhost:3000/signin-oidcnice").find());
-
-    assertTrue(globToRegex("**/*.js").matcher("/foo.js").find());
-    assertFalse(globToRegex("asd/**.js").matcher("/foo.js").find());
-    assertFalse(globToRegex("**/*.js").matcher("bar_foo.js").find());
+  @PlaywrightTest
+  void shouldWorkWithGlob(Playwright playwright) {
+    assertTrue(globToRegex(playwright, "**/*.js").matcher("https://localhost:8080/foo.js").find());
+    assertFalse(globToRegex(playwright, "**/*.css").matcher("https://localhost:8080/foo.js").find());
+    assertFalse(globToRegex(playwright, "*.js").matcher("https://localhost:8080/foo.js").find());
+    assertTrue(globToRegex(playwright, "https://**/*.js").matcher("https://localhost:8080/foo.js").find());
+    assertTrue(globToRegex(playwright, "http://localhost:8080/simple/path.js").matcher("http://localhost:8080/simple/path.js").find());
+    assertTrue(globToRegex(playwright, "**/{a,b}.js").matcher("https://localhost:8080/a.js").find());
+    assertTrue(globToRegex(playwright, "**/{a,b}.js").matcher("https://localhost:8080/b.js").find());
+    assertFalse(globToRegex(playwright, "**/{a,b}.js").matcher("https://localhost:8080/c.js").find());
+
+    assertTrue(globToRegex(playwright, "**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.jpg").find());
+    assertTrue(globToRegex(playwright, "**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.jpeg").find());
+    assertTrue(globToRegex(playwright, "**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.png").find());
+    assertFalse(globToRegex(playwright, "**/*.{png,jpg,jpeg}").matcher("https://localhost:8080/c.css").find());
+    assertTrue(globToRegex(playwright, "foo*").matcher("foo.js").find());
+    assertFalse(globToRegex(playwright, "foo*").matcher("foo/bar.js").find());
+    assertFalse(globToRegex(playwright, "http://localhost:3000/signin-oidc*").matcher("http://localhost:3000/signin-oidc/foo").find());
+    assertTrue(globToRegex(playwright, "http://localhost:3000/signin-oidc*").matcher("http://localhost:3000/signin-oidcnice").find());
+
+    assertTrue(globToRegex(playwright, "**/*.js").matcher("/foo.js").find());
+    assertFalse(globToRegex(playwright, "asd/**.js").matcher("/foo.js").find());
+    assertFalse(globToRegex(playwright, "**/*.js").matcher("bar_foo.js").find());
 
     // custom protocols
-    assertTrue(globToRegex("my.custom.protocol://**").matcher("my.custom.protocol://foo").find());
-    assertFalse(globToRegex("my.{p,y}://**").matcher("my.p://foo").find());
-    assertTrue(globToRegex("my.{p,y}://**").matcher("my.p://foo/").find());
-    assertTrue(globToRegex("f*e://**").matcher("file:///foo/").find());
+    assertTrue(globToRegex(playwright, "my.custom.protocol://**").matcher("my.custom.protocol://foo").find());
+    assertFalse(globToRegex(playwright, "my.{p,y}://**").matcher("my.p://foo").find());
+    assertTrue(globToRegex(playwright, "my.{p,y}://**").matcher("my.p://foo/").find());
+    assertTrue(globToRegex(playwright, "f*e://**").matcher("file:///foo/").find());
 
     // range [] is NOT supported
-    assertTrue(globToRegex("**/api/v[0-9]").matcher("http://example.com/api/v[0-9]").find());
-    assertFalse(globToRegex("**/api/v[0-9]").matcher("http://example.com/api/version").find());
+    assertTrue(globToRegex(playwright, "**/api/v[0-9]").matcher("http://example.com/api/v[0-9]").find());
+    assertFalse(globToRegex(playwright, "**/api/v[0-9]").matcher("http://example.com/api/version").find());
 
     // query params
-    assertTrue(globToRegex("**/api\\?param").matcher("http://example.com/api?param").find());
-    assertFalse(globToRegex("**/api\\?param").matcher("http://example.com/api-param").find());
-    assertTrue(globToRegex("**/three-columns/settings.html\\?**id=settings-**").matcher("http://mydomain:8080/blah/blah/three-columns/settings.html?id=settings-e3c58efe-02e9-44b0-97ac-dd138100cf7c&blah").find());
-
-    assertEquals("^\\?$", globToRegex("\\?").pattern());
-    assertEquals("^\\\\$", globToRegex("\\").pattern());
-    assertEquals("^\\\\$", globToRegex("\\\\").pattern());
-    assertEquals("^\\[$", globToRegex("\\[").pattern());
-    assertEquals("^\\[a-z\\]$", globToRegex("[a-z]").pattern());
-    assertEquals("^\\$\\^\\+\\.\\*\\(\\)\\|\\?\\{\\}\\[\\]$", globToRegex("$^+.\\*()|\\?\\{\\}\\[\\]").pattern());
-
-
-    assertTrue(urlMatches(null, "http://playwright.dev/", "http://playwright.dev"));
-    assertTrue(urlMatches(null, "http://playwright.dev/?a=b", "http://playwright.dev?a=b"));
-    assertTrue(urlMatches(null, "http://playwright.dev/", "h*://playwright.dev"));
-    assertTrue(urlMatches(null, "http://api.playwright.dev/?x=y", "http://*.playwright.dev?x=y"));
-    assertTrue(urlMatches(null, "http://playwright.dev/foo/bar", "**/foo/**"));
-    assertTrue(urlMatches("http://playwright.dev", "http://playwright.dev/?x=y", "?x=y"));
-    assertTrue(urlMatches("http://playwright.dev/foo/", "http://playwright.dev/foo/bar?x=y", "./bar?x=y"));
+    assertTrue(globToRegex(playwright, "**/api\\?param").matcher("http://example.com/api?param").find());
+    assertFalse(globToRegex(playwright, "**/api\\?param").matcher("http://example.com/api-param").find());
+    assertTrue(globToRegex(playwright, "**/three-columns/settings.html\\?**id=settings-**").matcher("http://mydomain:8080/blah/blah/three-columns/settings.html?id=settings-e3c58efe-02e9-44b0-97ac-dd138100cf7c&blah").find());
+
+    assertEquals("^\\?$", globToRegex(playwright, "\\?").pattern());
+    assertEquals("^\\\\$", globToRegex(playwright, "\\").pattern());
+    assertEquals("^\\\\$", globToRegex(playwright, "\\\\").pattern());
+    assertEquals("^\\[$", globToRegex(playwright, "\\[").pattern());
+    assertEquals("^\\[a-z\\]$", globToRegex(playwright, "[a-z]").pattern());
+    assertEquals("^\\$\\^\\+\\.\\*\\(\\)\\|\\?\\{\\}\\[\\]$", globToRegex(playwright, "$^+.\\*()|\\?\\{\\}\\[\\]").pattern());
+
+
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/", "http://playwright.dev"));
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/?a=b", "http://playwright.dev?a=b"));
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/", "h*://playwright.dev"));
+    assertTrue(urlMatches(playwright, null, "http://api.playwright.dev/?x=y", "http://*.playwright.dev?x=y"));
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/foo/bar", "**/foo/**"));
+    assertTrue(urlMatches(playwright, "http://playwright.dev", "http://playwright.dev/?x=y", "?x=y"));
+    assertTrue(urlMatches(playwright, "http://playwright.dev/foo/", "http://playwright.dev/foo/bar?x=y", "./bar?x=y"));
 
     // /**/ should match /.
-    assertTrue(urlMatches(null, "https://foo/bar.js", "https://foo/**/bar.js"));
-    assertTrue(urlMatches(null, "https://foo/bar.js", "https://foo/**/**/bar.js"));
+    assertTrue(urlMatches(playwright, null, "https://foo/bar.js", "https://foo/**/bar.js"));
+    assertTrue(urlMatches(playwright, null, "https://foo/bar.js", "https://foo/**/**/bar.js"));
 
     // Case insensitive matching
-    assertTrue(urlMatches(null, "https://playwright.dev/fooBAR", "HtTpS://pLaYwRiGhT.dEv/fooBAR"));
-    assertTrue(urlMatches("http://ignored", "https://playwright.dev/fooBAR", "HtTpS://pLaYwRiGhT.dEv/fooBAR"));
+    assertTrue(urlMatches(playwright, null, "https://playwright.dev/fooBAR", "HtTpS://pLaYwRiGhT.dEv/fooBAR"));
+    assertTrue(urlMatches(playwright, "http://ignored", "https://playwright.dev/fooBAR", "HtTpS://pLaYwRiGhT.dEv/fooBAR"));
     // Path and search query are case-sensitive
-    assertFalse(urlMatches(null, "https://playwright.dev/foobar", "https://playwright.dev/fooBAR"));
-    assertFalse(urlMatches(null, "https://playwright.dev/foobar?a=b", "https://playwright.dev/foobar?A=B"));
+    assertFalse(urlMatches(playwright, null, "https://playwright.dev/foobar", "https://playwright.dev/fooBAR"));
+    assertFalse(urlMatches(playwright, null, "https://playwright.dev/foobar?a=b", "https://playwright.dev/foobar?A=B"));
 
-    assertTrue(urlMatches(null, "https://localhost:3000/?a=b", "**/?a=b"));
-    assertTrue(urlMatches(null, "https://localhost:3000/?a=b", "**?a=b"));
-    assertTrue(urlMatches(null, "https://localhost:3000/?a=b", "**=b"));
+    assertTrue(urlMatches(playwright, null, "https://localhost:3000/?a=b", "**/?a=b"));
+    assertTrue(urlMatches(playwright, null, "https://localhost:3000/?a=b", "**?a=b"));
+    assertTrue(urlMatches(playwright, null, "https://localhost:3000/?a=b", "**=b"));
 
     // This is not supported, we treat ? as a query separator.
-    assertFalse(urlMatches(null, "http://localhost:8080/Simple/path.js", "http://localhost:8080/?imple/path.js"));
-    assertFalse(urlMatches(null, "http://playwright.dev/", "http://playwright.?ev"));
-    assertTrue(urlMatches(null, "http://playwright./?ev", "http://playwright.?ev"));
-    assertFalse(urlMatches(null, "http://playwright.dev/foo", "http://playwright.dev/f??"));
-    assertTrue(urlMatches(null, "http://playwright.dev/f??", "http://playwright.dev/f??"));
-    assertTrue(urlMatches(null, "http://playwright.dev/?x=y", "http://playwright.dev\\\\?x=y"));
-    assertTrue(urlMatches(null, "http://playwright.dev/?x=y", "http://playwright.dev/\\\\?x=y"));
-    assertTrue(urlMatches("http://playwright.dev/foo", "http://playwright.dev/foo?bar", "?bar"));
-    assertTrue(urlMatches("http://playwright.dev/foo", "http://playwright.dev/foo?bar", "\\\\?bar"));
-    assertTrue(urlMatches("http://first.host/", "http://second.host/foo", "**/foo"));
-    assertTrue(urlMatches("http://playwright.dev/", "http://localhost/", "*//localhost/"));
+    assertFalse(urlMatches(playwright, null, "http://localhost:8080/Simple/path.js", "http://localhost:8080/?imple/path.js"));
+    assertFalse(urlMatches(playwright, null, "http://playwright.dev/", "http://playwright.?ev"));
+    assertTrue(urlMatches(playwright, null, "http://playwright./?ev", "http://playwright.?ev"));
+    assertFalse(urlMatches(playwright, null, "http://playwright.dev/foo", "http://playwright.dev/f??"));
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/f??", "http://playwright.dev/f??"));
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/?x=y", "http://playwright.dev\\\\?x=y"));
+    assertTrue(urlMatches(playwright, null, "http://playwright.dev/?x=y", "http://playwright.dev/\\\\?x=y"));
+    assertTrue(urlMatches(playwright, "http://playwright.dev/foo", "http://playwright.dev/foo?bar", "?bar"));
+    assertTrue(urlMatches(playwright, "http://playwright.dev/foo", "http://playwright.dev/foo?bar", "\\\\?bar"));
+    assertTrue(urlMatches(playwright, "http://first.host/", "http://second.host/foo", "**/foo"));
+    assertTrue(urlMatches(playwright, "http://playwright.dev/", "http://localhost/", "*//localhost/"));
 
     String[] customPrefixes = {"about", "data", "chrome", "edge", "file"};
     for (String prefix : customPrefixes) {
-      assertTrue(urlMatches("http://playwright.dev/", prefix + ":blank", prefix + ":blank"));
-      assertFalse(urlMatches("http://playwright.dev/", prefix + ":blank", "http://playwright.dev/"));
-      assertTrue(urlMatches(null, prefix + ":blank", prefix + ":blank"));
-      assertTrue(urlMatches(null, prefix + ":blank", prefix + ":*"));
-      assertFalse(urlMatches(null, "not" + prefix + ":blank", prefix + ":*"));
+      assertTrue(urlMatches(playwright, "http://playwright.dev/", prefix + ":blank", prefix + ":blank"));
+      assertFalse(urlMatches(playwright, "http://playwright.dev/", prefix + ":blank", "http://playwright.dev/"));
+      assertTrue(urlMatches(playwright, null, prefix + ":blank", prefix + ":blank"));
+      assertTrue(urlMatches(playwright, null, prefix + ":blank", prefix + ":*"));
+      assertFalse(urlMatches(playwright, null, "not" + prefix + ":blank", prefix + ":*"));
     }
   }
 
-  Pattern globToRegex(String glob) {
-    return globToRegex(glob, null, false);
+  Pattern globToRegex(Playwright playwright, String glob) {
+    return globToRegex(playwright, glob, null, false);
   }
 
-  Pattern globToRegex(String glob, String baseURL, boolean webSocketUrl) {
+  Pattern globToRegex(Playwright playwright, String glob, String baseURL, boolean webSocketUrl) {
     return ((PlaywrightImpl) playwright).localUtils().globToRegex(glob, baseURL, webSocketUrl);
   }
 
-  boolean urlMatches(String baseURL, String urlString, String match) {
+  boolean urlMatches(Playwright playwright, String baseURL, String urlString, String match) {
     if (match == null) {
       return true;
     }
@@ -252,6 +253,6 @@ boolean urlMatches(String baseURL, String urlString, String match) {
       return true;
     }
 
-    return globToRegex(glob, baseURL, false).matcher(urlString).find();
+    return globToRegex(playwright, glob, baseURL, false).matcher(urlString).find();
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java b/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java
index feb3ad04b..cd0538042 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageKeyboard.java
@@ -16,21 +16,26 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static com.microsoft.playwright.Utils.attachFrame;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
+import static com.microsoft.playwright.fixtures.Env.isMac;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageKeyboard extends TestBase {
+public class TestPageKeyboard {
 
-  @Test
-  void shouldTypeIntoATextarea() {
+  @PlaywrightTest
+  void shouldTypeIntoATextarea(Page page) {
     page.evaluate("() => {\n" +
       "  const textarea = document.createElement('textarea');\n" +
       "  document.body.appendChild(textarea);\n" +
@@ -41,8 +46,8 @@ void shouldTypeIntoATextarea() {
     assertEquals(text, page.evaluate("() => document.querySelector('textarea').value"));
   }
 
-  @Test
-  void shouldMoveWithTheArrowKeys() {
+  @PlaywrightTest
+  void shouldMoveWithTheArrowKeys(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.type("textarea", "Hello World!");
     assertEquals("Hello World!", page.evaluate("() => document.querySelector('textarea').value"));
@@ -60,8 +65,8 @@ void shouldMoveWithTheArrowKeys() {
     assertEquals("Hello World!", page.evaluate("() => document.querySelector('textarea').value"));
   }
 
-  @Test
-  void shouldSendACharacterWithElementHandlePress() {
+  @PlaywrightTest
+  void shouldSendACharacterWithElementHandlePress(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle textarea = page.querySelector("textarea");
     textarea.press("a");
@@ -71,8 +76,8 @@ void shouldSendACharacterWithElementHandlePress() {
     assertEquals("a", page.evaluate("() => document.querySelector('textarea').value"));
   }
 
-  @Test
-  void shouldSendACharacterWithInsertText() {
+  @PlaywrightTest
+  void shouldSendACharacterWithInsertText(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.focus("textarea");
     page.keyboard().insertText("嗨");
@@ -82,8 +87,8 @@ void shouldSendACharacterWithInsertText() {
     assertEquals("嗨a", page.evaluate("() => document.querySelector('textarea').value"));
   }
 
-  @Test
-  void insertTextShouldOnlyEmitInputEvent() {
+  @PlaywrightTest
+  void insertTextShouldOnlyEmitInputEvent(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.focus("textarea");
     JSHandle events = page.evaluateHandle("() => {\n" +
@@ -98,10 +103,10 @@ void insertTextShouldOnlyEmitInputEvent() {
     assertEquals(asList("input"), events.jsonValue());
   }
 
-  @Test
-  void shouldReportShiftKey() {
+  @PlaywrightTest
+  void shouldReportShiftKey(Page page, Server server, BrowserName browserName) {
     // Do NOT test on MacOS Firefox
-    Assumptions.assumeFalse( isFirefox() && isMac);
+    Assumptions.assumeFalse( browserName == FIREFOX && isMac);
     page.navigate(server.PREFIX + "/input/keyboard.html");
     Keyboard keyboard = page.keyboard();
     Map<String, Integer> codeForKey = new HashMap<>();
@@ -124,8 +129,8 @@ void shouldReportShiftKey() {
     });
   }
 
-  @Test
-  void shouldReportMultipleModifiers() {
+  @PlaywrightTest
+  void shouldReportMultipleModifiers(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     Keyboard keyboard = page.keyboard();
     keyboard.down("Control");
@@ -142,8 +147,8 @@ void shouldReportMultipleModifiers() {
     assertEquals("Keyup: Alt AltLeft 18 []", page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldSendProperCodesWhileTyping() {
+  @PlaywrightTest
+  void shouldSendProperCodesWhileTyping(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     page.keyboard().type("!");
     assertEquals(String.join("\n",
@@ -159,8 +164,8 @@ void shouldSendProperCodesWhileTyping() {
       page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldSendProperCodesWhileTypingWithShift() {
+  @PlaywrightTest
+  void shouldSendProperCodesWhileTypingWithShift(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     Keyboard keyboard = page.keyboard();
     keyboard.down("Shift");
@@ -174,8 +179,8 @@ void shouldSendProperCodesWhileTypingWithShift() {
     keyboard.up("Shift");
   }
 
-  @Test
-  void shouldNotTypeCanceledEvents() {
+  @PlaywrightTest
+  void shouldNotTypeCanceledEvents(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.focus("textarea");
     page.evaluate("() => {\n" +
@@ -192,8 +197,8 @@ void shouldNotTypeCanceledEvents() {
     assertEquals("He Wrd!", page.evalOnSelector("textarea", "textarea => textarea.value"));
   }
 
-  @Test
-  void shouldPressPlus() {
+  @PlaywrightTest
+  void shouldPressPlus(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     page.keyboard().press("+");
     assertEquals(String.join("\n",
@@ -203,8 +208,8 @@ void shouldPressPlus() {
         page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldPressShiftPlus() {
+  @PlaywrightTest
+  void shouldPressShiftPlus(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     page.keyboard().press("Shift++");
     assertEquals(String.join("\n",
@@ -216,8 +221,8 @@ void shouldPressShiftPlus() {
       page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldSupportPlusSeparatedModifier(){
+  @PlaywrightTest
+  void shouldSupportPlusSeparatedModifier(Page page, Server server){
     page.navigate(server.PREFIX + "/input/keyboard.html");
     page.keyboard().press("Shift+~");
     assertEquals(String.join("\n",
@@ -229,8 +234,8 @@ void shouldSupportPlusSeparatedModifier(){
       page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldSupportMultiplePlusSeparatedModifier() {
+  @PlaywrightTest
+  void shouldSupportMultiplePlusSeparatedModifier(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     page.keyboard().press("Control+Shift+~");
     assertEquals(String.join("\n",
@@ -243,8 +248,8 @@ void shouldSupportMultiplePlusSeparatedModifier() {
       page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldShiftRawCodes() {
+  @PlaywrightTest
+  void shouldShiftRawCodes(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/keyboard.html");
     page.keyboard().press("Shift+Digit3");
     assertEquals(String.join("\n",
@@ -256,11 +261,11 @@ void shouldShiftRawCodes() {
       page.evaluate("getResult()"));
   }
 
-  @Test
-  void shouldSpecifyRepeatProperty() {
+  @PlaywrightTest
+  void shouldSpecifyRepeatProperty(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.focus("textarea");
-    JSHandle lastEvent = captureLastKeyDown();
+    JSHandle lastEvent = captureLastKeyDown(page);
     page.keyboard().down("a");
     assertEquals(false, lastEvent.evaluate("e => e.repeat"));
     page.keyboard().press("a");
@@ -274,8 +279,8 @@ void shouldSpecifyRepeatProperty() {
     assertEquals(false, lastEvent.evaluate("e => e.repeat"));
   }
 
-  @Test
-  void shouldTypeAllKindsOfCharacters() {
+  @PlaywrightTest
+  void shouldTypeAllKindsOfCharacters(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.focus("textarea");
     final String text = "This text goes onto two lines.\\nThis character is 嗨.";
@@ -283,10 +288,10 @@ void shouldTypeAllKindsOfCharacters() {
     assertEquals(text, page.evalOnSelector("textarea", "t => t.value"));
   }
 
-  @Test
-  void shouldSpecifyLocation() {
+  @PlaywrightTest
+  void shouldSpecifyLocation(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
-    JSHandle lastEvent = captureLastKeyDown();
+    JSHandle lastEvent = captureLastKeyDown(page);
     ElementHandle textarea = page.querySelector("textarea");
     textarea.press("Digit5");
     assertEquals(0, lastEvent.evaluate("e => e.location"));
@@ -298,19 +303,19 @@ void shouldSpecifyLocation() {
     assertEquals(3, lastEvent.evaluate("e => e.location"));
   }
 
-  @Test
-  void shouldPressEnter() {
+  @PlaywrightTest
+  void shouldPressEnter(Page page) {
     page.setContent("<textarea></textarea>");
     page.focus("textarea");
-    JSHandle lastEvent = captureLastKeyDown();
-    testEnterKey(lastEvent, "Enter", "Enter", "Enter");
-    testEnterKey(lastEvent, "NumpadEnter", "Enter", "NumpadEnter");
-    testEnterKey(lastEvent, "\n", "Enter", "Enter");
-    testEnterKey(lastEvent,"\r", "Enter", "Enter");
+    JSHandle lastEvent = captureLastKeyDown(page);
+    testEnterKey(page, lastEvent, "Enter", "Enter", "Enter");
+    testEnterKey(page, lastEvent, "NumpadEnter", "Enter", "NumpadEnter");
+    testEnterKey(page, lastEvent, "\n", "Enter", "Enter");
+    testEnterKey(page, lastEvent,"\r", "Enter", "Enter");
   }
 
-  @Test
-  void shouldThrowOnUnknownKeys() {
+  @PlaywrightTest
+  void shouldThrowOnUnknownKeys(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.keyboard().press("NotARealKey"));
     assertTrue(e.getMessage().contains("Unknown key: \"NotARealKey\""), "Expecting Exception: " + e.getMessage() + " contain: Unknown key: \"NotARealKey\"");
 
@@ -321,15 +326,15 @@ void shouldThrowOnUnknownKeys() {
     assertTrue(e.getMessage().contains("Unknown key: \"😊\""), "Expecting Exception: " + e.getMessage() + " contain: Unknown key: \"😊\"");
   }
 
-  @Test
-  void shouldTypeEmoji() {
+  @PlaywrightTest
+  void shouldTypeEmoji(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     page.type("textarea", "👹 Tokyo street Japan 🇯🇵");
     assertEquals("👹 Tokyo street Japan 🇯🇵", page.evalOnSelector("textarea", "textarea => textarea.value"));
   }
 
-  @Test
-  void shouldTypeEmojiIntoAnIframe() {
+  @PlaywrightTest
+  void shouldTypeEmojiIntoAnIframe(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     attachFrame(page, "emoji-test", server.PREFIX + "/input/textarea.html");
     Frame frame = page.frames().get(1);
@@ -338,8 +343,8 @@ void shouldTypeEmojiIntoAnIframe() {
     assertEquals("👹 Tokyo street Japan 🇯🇵", frame.evalOnSelector("textarea", "textarea => textarea.value"));
   }
 
-  @Test
-  void shouldHandleSelectAll() {
+  @PlaywrightTest
+  void shouldHandleSelectAll(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle textarea = page.querySelector("textarea");
     textarea.type("some text");
@@ -350,8 +355,8 @@ void shouldHandleSelectAll() {
     assertTrue(((String)page.evalOnSelector("textarea", "textarea => textarea.value")).isEmpty());
   }
 
-  @Test
-  void shouldBeAbleToPreventSelectAll() {
+  @PlaywrightTest
+  void shouldBeAbleToPreventSelectAll(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle textarea = page.querySelector("textarea");
     textarea.type("some text");
@@ -368,12 +373,12 @@ void shouldBeAbleToPreventSelectAll() {
     assertEquals("some tex", page.evalOnSelector("textarea", "textarea => textarea.value"));
   }
 
-  @Test
-  void shouldSupportMacOSShortcuts() {
+  @PlaywrightTest
+  void shouldSupportMacOSShortcuts(Page page, Server server, BrowserName browserName) {
     // Test for MacOS only
     Assumptions.assumeTrue(isMac);
     // @see https://github.com/microsoft/playwright/issues/5721
-    Assumptions.assumeFalse(isFirefox());
+    Assumptions.assumeFalse(browserName == FIREFOX);
     page.navigate(server.PREFIX + "/input/textarea.html");
     ElementHandle textarea = page.querySelector("textarea");
     textarea.type("some text");
@@ -383,9 +388,9 @@ void shouldSupportMacOSShortcuts() {
     assertEquals("some ", page.evalOnSelector("textarea", "textarea => textarea.value"));
   }
 
-  @Test
-  void shouldPressMetaKey() {
-    JSHandle lastEvent = captureLastKeyDown();
+  @PlaywrightTest
+  void shouldPressMetaKey(Page page) {
+    JSHandle lastEvent = captureLastKeyDown(page);
     page.keyboard().press("Meta");
     LinkedHashMap eventData = (LinkedHashMap) lastEvent.jsonValue();
     assertEquals("Meta", eventData.get("key"));
@@ -393,20 +398,19 @@ void shouldPressMetaKey() {
     assertTrue((Boolean) eventData.get("metaKey"), eventData.toString());
   }
 
-  @Test
-  void shouldWorkAfterACrossOriginNavigation() {
+  @PlaywrightTest
+  void shouldWorkAfterACrossOriginNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/empty.html");
     page.navigate(server.CROSS_PROCESS_PREFIX + "/empty.html");
-    JSHandle lastEvent = captureLastKeyDown();
+    JSHandle lastEvent = captureLastKeyDown(page);
     page.keyboard().press("a");
     assertEquals("a", lastEvent.evaluate("l => l.key"));
   }
 
-  @Test
-  void shouldExposeKeyIdentifierInWebKit() {
-    // Test for webkit only
-    Assumptions.assumeTrue(isWebKit());
-    JSHandle lastEvent = captureLastKeyDown();
+  @PlaywrightTest
+  @EnabledOnBrowser(WEBKIT)
+  void shouldExposeKeyIdentifierInWebKit(Page page) {
+    JSHandle lastEvent = captureLastKeyDown(page);
     Map<String, String> keyMap = new HashMap<>();
     keyMap.put("ArrowUp", "Up");
     keyMap.put("ArrowDown", "Down");
@@ -424,8 +428,8 @@ void shouldExposeKeyIdentifierInWebKit() {
     });
   }
 
-  @Test
-  void shouldScrollWithPageDown() {
+  @PlaywrightTest
+  void shouldScrollWithPageDown(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/scrollable.html");
     // A click is required for WebKit to send the event into the body.
     page.click("body");
@@ -434,7 +438,7 @@ void shouldScrollWithPageDown() {
     page.waitForFunction("() => scrollY > 0");
   }
 
-  private JSHandle captureLastKeyDown() {
+  private JSHandle captureLastKeyDown(Page page) {
     JSHandle lastEvent = page.evaluateHandle("() => {\n" +
       "  const lastEvent = {\n" +
       "    repeat: false,\n" +
@@ -458,7 +462,7 @@ private JSHandle captureLastKeyDown() {
     return lastEvent;
   }
 
-  private void testEnterKey(JSHandle lastEventHandle, String key, String expectedKey, String expectedCode) {
+  private void testEnterKey(Page page, JSHandle lastEventHandle, String key, String expectedKey, String expectedCode) {
     page.keyboard().press(key);
     LinkedHashMap lastEvent = (LinkedHashMap) lastEventHandle.jsonValue();
     assertEquals(expectedKey, lastEvent.get("key"), lastEvent.toString());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorConvenience.java b/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorConvenience.java
index 911062825..520c885fc 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorConvenience.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorConvenience.java
@@ -16,13 +16,13 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageLocatorConvenience extends TestBase {
-  @Test
-  void shouldReturnPage() {
+public class TestPageLocatorConvenience {
+  @PlaywrightTest
+  void shouldReturnPage(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/two-frames.html");
     Locator outer = page.locator("#outer");
     assertEquals(page, outer.page());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorQuery.java b/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorQuery.java
index c3d5d0f78..4b64aadbd 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorQuery.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageLocatorQuery.java
@@ -16,17 +16,17 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
-import org.junit.jupiter.api.Test;
 
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageLocatorQuery extends TestBase {
-  @Test
-  void shouldRespectFirstAndLast() {
+public class TestPageLocatorQuery {
+  @PlaywrightTest
+  void shouldRespectFirstAndLast(Page page) {
     page.setContent("<section>\n" +
       "    <div><p>A</p></div>\n" +
       "    <div><p>A</p><p>A</p></div>\n" +
@@ -38,8 +38,8 @@ void shouldRespectFirstAndLast() {
     assertEquals(3, page.locator("div").last().locator("p").count());
   }
 
-  @Test
-  void shouldRespectNth() {
+  @PlaywrightTest
+  void shouldRespectNth(Page page) {
     page.setContent("<section>\n" +
       "    <div><p>A</p></div>\n" +
       "    <div><p>A</p><p>A</p></div>\n" +
@@ -50,8 +50,8 @@ void shouldRespectNth() {
     assertEquals(3, page.locator("div").nth(2).locator("p").count());
   }
 
-  @Test
-  void shouldThrowOnCaptureWNth() {
+  @PlaywrightTest
+  void shouldThrowOnCaptureWNth(Page page) {
     page.setContent("<section><div><p>A</p></div></section>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.locator("*css=div >> p").nth(1).click();
@@ -59,8 +59,8 @@ void shouldThrowOnCaptureWNth() {
     assertTrue(e.getMessage().contains("Can't query n-th element"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowOnDueToStrictness() {
+  @PlaywrightTest
+  void shouldThrowOnDueToStrictness(Page page) {
     page.setContent("<div>A</div><div>B</div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.locator("div").isVisible();
@@ -68,8 +68,8 @@ void shouldThrowOnDueToStrictness() {
     assertTrue(e.getMessage().contains("strict mode violation"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowOnDueToStrictness2() {
+  @PlaywrightTest
+  void shouldThrowOnDueToStrictness2(Page page) {
     page.setContent("<select><option>One</option><option>Two</option></select>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.locator("option").evaluate("e => {}");
@@ -77,38 +77,38 @@ void shouldThrowOnDueToStrictness2() {
     assertTrue(e.getMessage().contains("strict mode violation"), e.getMessage());
   }
 
-  @Test
-  void shouldFilterByText() {
+  @PlaywrightTest
+  void shouldFilterByText(Page page) {
     page.setContent("<div>Foobar</div><div>Bar</div>");
     assertEquals("Foobar", page.locator("div", new Page.LocatorOptions().setHasText("Foo")).textContent());
   }
 
-  @Test
-  void shouldFilterByText2() {
+  @PlaywrightTest
+  void shouldFilterByText2(Page page) {
     page.setContent("<div>foo <span>hello world</span> bar</div>");
     assertEquals("foo hello world bar", page.locator("div", new Page.LocatorOptions().setHasText("hello world")).textContent());
   }
 
-  @Test
-  void shouldFilterByRegex() {
+  @PlaywrightTest
+  void shouldFilterByRegex(Page page) {
     page.setContent("<div>Foobar</div><div>Bar</div>");
     assertEquals("Foobar", page.locator("div", new Page.LocatorOptions().setHasText(Pattern.compile("Foo.*"))).textContent());
   }
 
-  @Test
-  void shouldFilterByTextWithQuotes() {
+  @PlaywrightTest
+  void shouldFilterByTextWithQuotes(Page page) {
     page.setContent("<div>Hello \"world\"</div><div>Hello world</div>");
     assertEquals("Hello \"world\"", page.locator("div", new Page.LocatorOptions().setHasText("Hello \"world\"")).textContent());
   }
 
-  @Test
-  void shouldFilterByRegexWithQuotes() {
+  @PlaywrightTest
+  void shouldFilterByRegexWithQuotes(Page page) {
     page.setContent("<div>Hello \"world\"</div><div>Hello world</div>");
     assertEquals("Hello \"world\"", page.locator("div", new Page.LocatorOptions().setHasText(Pattern.compile("Hello \"world\""))).textContent());
   }
 
-  @Test
-  void shouldFilterByRegexWithASingleQuote() {
+  @PlaywrightTest
+  void shouldFilterByRegexWithASingleQuote(Page page) {
     page.setContent("<button>let's let's<span>hello</span></button>");
     assertThat(page.locator("button", new Page.LocatorOptions().setHasText(Pattern.compile("let's", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
     assertThat(page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName(Pattern.compile("let's", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
@@ -140,35 +140,35 @@ void shouldFilterByRegexWithASingleQuote() {
     assertThat(page.getByRole(AriaRole.BUTTON,  new Page.GetByRoleOptions().setName(Pattern.compile("let\\\\\\'s let\\\\'s", Pattern.CASE_INSENSITIVE))).locator("span")).hasText("hello");
   }
 
-  @Test
-  void shouldFilterByRegexAndRegexpFlags() {
+  @PlaywrightTest
+  void shouldFilterByRegexAndRegexpFlags(Page page) {
     page.setContent("<div>Hello \"world\"</div><div>Hello world</div>");
     Pattern pattern = Pattern.compile("hElLo \"world\"", Pattern.CASE_INSENSITIVE);
     assertEquals("Hello \"world\"", page.locator("div", new Page.LocatorOptions().setHasText(pattern)).textContent());
   }
 
-  @Test
-  void shouldFilterByCaseInsensitiveRegexInAChild() {
+  @PlaywrightTest
+  void shouldFilterByCaseInsensitiveRegexInAChild(Page page) {
     page.setContent("<div class=\"test\"><h5>Title Text</h5></div>");
     Pattern pattern = Pattern.compile("^title text$", Pattern.CASE_INSENSITIVE);
     assertThat(page.locator("div", new Page.LocatorOptions().setHasText(pattern))).hasText("Title Text");
   }
 
-  @Test
-  void shouldFilterByCaseInsensitiveRegexInMultipleChildren() {
+  @PlaywrightTest
+  void shouldFilterByCaseInsensitiveRegexInMultipleChildren(Page page) {
     page.setContent("<div class=\"test\"><h5>Title</h5> <h2><i>Text</i></h2></div>`");
     Pattern pattern = Pattern.compile("^title text$", Pattern.CASE_INSENSITIVE);
     assertThat(page.locator("div", new Page.LocatorOptions().setHasText(pattern))).hasClass("test");
   }
 
-  @Test
-  void shouldFilterByRegexWithSpecialSymbols() {
+  @PlaywrightTest
+  void shouldFilterByRegexWithSpecialSymbols(Page page) {
     page.setContent("<div class=\"test\"><h5>First/\"and\"</h5><h2><i>Second\\</i></h2></div>");
     Pattern pattern = Pattern.compile("first\\/\".*\"second\\\\$", Pattern.CASE_INSENSITIVE);
     assertThat(page.locator("div", new Page.LocatorOptions().setHasText(pattern))).hasClass("test");
   }
-  @Test
-  void shouldFilterByTextWithAmpersand() {
+  @PlaywrightTest
+  void shouldFilterByTextWithAmpersand(Page page) {
     page.setContent("<div>Save & Continue</div>");
     assertEquals("Save & Continue", page.locator("div",
       new Page.LocatorOptions().setHasText("Save & Continue")).textContent());
@@ -177,8 +177,8 @@ void shouldFilterByTextWithAmpersand() {
   private static String removeHighlight(String markup) {
     return markup.replaceAll("\\s__playwright_target__=\"[^\"]+\"", "");
   }
-  @Test
-  void shouldSupportHasLocator() {
+  @PlaywrightTest
+  void shouldSupportHasLocator(Page page) {
     page.setContent("<div><span>hello</span></div><div><span>world</span></div>");
     assertThat(page.locator("div", new Page.LocatorOptions().setHas(page.locator("text=world")))).hasCount(1);
     assertEquals("<div><span>world</span></div>", removeHighlight((String) page.locator("div", new Page.LocatorOptions().setHas(page.locator("text=world"))).evaluate("e => e.outerHTML")));
@@ -193,8 +193,8 @@ void shouldSupportHasLocator() {
         .setHas(page.locator("span")).setHasText("wor"))).hasCount(1);
   }
 
-  @Test
-  void shouldSupportLocatorFilter() {
+  @PlaywrightTest
+  void shouldSupportLocatorFilter(Page page) {
     page.setContent("<section><div><span>hello</span></div><div><span>world</span></div></section>");
     assertThat(page.locator("div").filter(new Locator.FilterOptions().setHasText("hello"))).hasCount(1);
     assertThat(page.locator("div", new Page.LocatorOptions().setHasText("hello")).filter(new Locator.FilterOptions().setHasText("hello"))).hasCount(1);
@@ -217,8 +217,8 @@ void shouldSupportLocatorFilter() {
   }
 
 
-  @Test
-  void shouldSupportLocatorAnd() {
+  @PlaywrightTest
+  void shouldSupportLocatorAnd(Page page) {
     page.setContent("<div data-testid=foo>hello</div><div data-testid=bar>world</div>\n" +
       "    <span data-testid=foo>hello2</span><span data-testid=bar>world2</span>");
     assertThat(page.locator("div").and(page.locator("div"))).hasCount(2);
@@ -229,8 +229,8 @@ void shouldSupportLocatorAnd() {
     assertThat(page.locator("span").and(page.getByTestId(Pattern.compile("bar|foo")))).hasCount(2);
   }
 
-  @Test
-  void shouldSupportLocatorOr() {
+  @PlaywrightTest
+  void shouldSupportLocatorOr(Page page) {
     page.setContent("<div>hello</div><span>world</span>");
     assertThat(page.locator("div").or(page.locator("span"))).hasCount(2);
     assertThat(page.locator("div").or(page.locator("span"))).hasText(new String[]{"hello", "world"});
@@ -242,8 +242,8 @@ void shouldSupportLocatorOr() {
     assertThat(page.locator("span").or(page.locator("article"))).hasText("world");
   }
 
-  @Test
-  void shouldSupportLocatorLocatorWithAndOr() {
+  @PlaywrightTest
+  void shouldSupportLocatorLocatorWithAndOr(Page page) {
     page.setContent("\n" +
       "    <div>one <span>two</span> <button>three</button> </div>\n" +
       "    <span>four</span>\n" +
@@ -258,8 +258,8 @@ void shouldSupportLocatorLocatorWithAndOr() {
     assertThat(page.locator("button").and(page.getByRole(AriaRole.BUTTON))).hasText(new String[]{"three", "five"});
   }
 
-  @Test
-  void shouldSupportLocatorWithin() {
+  @PlaywrightTest
+  void shouldSupportLocatorWithin(Page page) {
     page.setContent("\n" +
       "    <table>\n" +
       "      <tr><td>a1</td><td>a2</td><td>a3</td></tr>\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageNavigate.java b/playwright/src/test/java/com/microsoft/playwright/TestPageNavigate.java
index b230f0b3b..7872374a6 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageNavigate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageNavigate.java
@@ -16,40 +16,43 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.WaitUntilState;
-import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageNavigate extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageNavigate {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, page.url());
   }
 
-  @Test
-  void shouldWorkWithFileURL() {
+  @PlaywrightTest
+  void shouldWorkWithFileURL(Page page) {
     String fileUrl = Paths.get("src/test/resources/frames/two-frames.html").toUri().toString();
     page.navigate(fileUrl);
     assertEquals(fileUrl.toLowerCase(), page.url().toLowerCase());
     assertEquals(3, page.frames().size());
   }
 
-  @Test
-  void shouldUseHttpForNoProtocol() {
+  @PlaywrightTest
+  void shouldUseHttpForNoProtocol(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE.substring("http://".length()));
     assertEquals(server.EMPTY_PAGE, page.url());
   }
 
-  @Test
-  void shouldWorkCrossProcess() {
+  @PlaywrightTest
+  void shouldWorkCrossProcess(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, page.url());
 
@@ -61,8 +64,8 @@ void shouldWorkCrossProcess() {
     assertEquals(url, response.url());
   }
 
-  @Test
-  void shouldCaptureIframeNavigationRequest() {
+  @PlaywrightTest
+  void shouldCaptureIframeNavigationRequest(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, page.url());
     Request request = page.waitForRequest(server.PREFIX + "/frames/frame.html", () -> {
@@ -76,8 +79,8 @@ void shouldCaptureIframeNavigationRequest() {
     assertEquals(page.frames().get(1), request.frame());
   }
 
-  @Test
-  void shouldWorkWithAnchorNavigation() {
+  @PlaywrightTest
+  void shouldWorkWithAnchorNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, page.url());
     page.navigate(server.EMPTY_PAGE + "#foo");
@@ -86,8 +89,8 @@ void shouldWorkWithAnchorNavigation() {
     assertEquals(server.EMPTY_PAGE + "#bar", page.url());
   }
 
-  @Test
-  void shouldWorkWithRedirects() {
+  @PlaywrightTest
+  void shouldWorkWithRedirects(Page page, Server server) {
     server.setRedirect("/redirect/1.html", "/redirect/2.html");
     server.setRedirect("/redirect/2.html", "/empty.html");
     Response response = page.navigate(server.PREFIX + "/redirect/1.html");
@@ -95,20 +98,20 @@ void shouldWorkWithRedirects() {
     assertEquals(server.EMPTY_PAGE, page.url());
   }
 
-  @Test
-  void shouldNavigateToAboutBlank() {
+  @PlaywrightTest
+  void shouldNavigateToAboutBlank(Page page) {
     Response response = page.navigate("about:blank");
     assertNull(response);
   }
 
-  @Test
-  void shouldReturnResponseWhenPageChangesItsURLAfterLoad() {
+  @PlaywrightTest
+  void shouldReturnResponseWhenPageChangesItsURLAfterLoad(Page page, Server server) {
     Response response = page.navigate(server.PREFIX + "/historyapi.html");
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldWorkWithSubframesReturn204() {
+  @PlaywrightTest
+  void shouldWorkWithSubframesReturn204(Page page, Server server) {
     server.setRoute("/frames/frame.html", exchange -> {
       exchange.sendResponseHeaders(204, -1);
       exchange.getResponseBody().close();
@@ -116,8 +119,8 @@ void shouldWorkWithSubframesReturn204() {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
   }
 
-  @Test
-  void shouldWorkWithSubframesReturn204WithDomcontentloaded() {
+  @PlaywrightTest
+  void shouldWorkWithSubframesReturn204WithDomcontentloaded(Page page, Server server) {
     server.setRoute("/frames/frame.html", exchange -> {
       exchange.sendResponseHeaders(204, -1);
       exchange.getResponseBody().close();
@@ -125,38 +128,38 @@ void shouldWorkWithSubframesReturn204WithDomcontentloaded() {
     page.navigate(server.PREFIX + "/frames/one-frame.html", new Page.NavigateOptions().setWaitUntil(WaitUntilState.DOMCONTENTLOADED));
   }
 
-  @Test
-  void shouldFailWhenServerReturns204() {
+  @PlaywrightTest
+  void shouldFailWhenServerReturns204(Page page, Server server, BrowserName browserName) {
     // WebKit just loads an empty page.
     server.setRoute("/empty.html", exchange -> {
       exchange.sendResponseHeaders(204, -1);
       exchange.getResponseBody().close();
     });
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
-    if (isChromium())
+    if (browserName == CHROMIUM)
       assertTrue(e.getMessage().contains("net::ERR_ABORTED"));
-    else if (isWebKit())
+    else if (browserName == WEBKIT)
       assertTrue(e.getMessage().contains("Aborted: 204 No Content"));
     else
       assertTrue(e.getMessage().contains("NS_BINDING_ABORTED"));
   }
 
-  @Test
-  void shouldNavigateToEmptyPageWithDomcontentloaded() {
+  @PlaywrightTest
+  void shouldNavigateToEmptyPageWithDomcontentloaded(Page page, Server server) {
     Response response = page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setWaitUntil(WaitUntilState.DOMCONTENTLOADED));
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldWorkWhenPageCallsHistoryAPIInBeforeunload() {
+  @PlaywrightTest
+  void shouldWorkWhenPageCallsHistoryAPIInBeforeunload(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("window.addEventListener('beforeunload', () => history.replaceState(null, 'initial', window.location.href), false);");
     Response response = page.navigate(server.PREFIX + "/grid.html");
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldCaptureCrossProcessIframeNavigationRequest() {
+  @PlaywrightTest
+  void shouldCaptureCrossProcessIframeNavigationRequest(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(server.EMPTY_PAGE, page.url());
 
@@ -171,8 +174,8 @@ void shouldCaptureCrossProcessIframeNavigationRequest() {
     assertEquals(page.frames().get(1), request.frame());
   }
 
-  @Test
-  void shouldSendReferer() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSendReferer(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request1 = server.futureRequest("/grid.html");
     Future<Server.Request> request2 = server.futureRequest("/digits/1.png");
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java
index bef24972f..eeed74f12 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkRequest.java
@@ -17,8 +17,9 @@
 package com.microsoft.playwright;
 
 import com.google.gson.Gson;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HttpHeader;
-import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -29,11 +30,15 @@
 import java.util.concurrent.Semaphore;
 import java.util.stream.Collectors;
 
+import static com.microsoft.playwright.Utils.waitForCondition;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
+import static com.microsoft.playwright.fixtures.Env.isWindows;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageNetworkRequest extends TestBase {
-  @Test
-  void shouldReportRawHeaders() throws InterruptedException {
+public class TestPageNetworkRequest {
+  @PlaywrightTest
+  void shouldReportRawHeaders(Page page, Server server, BrowserName browserName) throws InterruptedException {
     List<HttpHeader> serverHeaders = new ArrayList<>();
     Semaphore responseWritten = new Semaphore(0);
     server.setRoute("/headers", exchange -> {
@@ -64,12 +69,12 @@ void shouldReportRawHeaders() throws InterruptedException {
     responseWritten.acquire();
 
     List<HttpHeader> expectedHeaders = serverHeaders;
-    if (isWebKit() && isWindows) {
+    if (browserName == WEBKIT && isWindows) {
       expectedHeaders = expectedHeaders.stream()
         .filter(h -> !"accept-encoding".equals(h.name.toLowerCase()) && !"accept-language".equals(h.name.toLowerCase()))
         .collect(Collectors.toList());
     }
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       expectedHeaders = expectedHeaders.stream()
         .filter(h -> !"priority".equals(h.name.toLowerCase()))
         .collect(Collectors.toList());
@@ -93,8 +98,8 @@ void shouldReportRawHeaders() throws InterruptedException {
     assertEquals(null, request.headerValue("not-there"));
   }
 
-  @Test
-  void shouldReportAllCookiesInOneHeader() {
+  @PlaywrightTest
+  void shouldReportAllCookiesInOneHeader(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("() => {\n" +
       "    document.cookie = 'myCookie=myValue';\n" +
@@ -105,8 +110,8 @@ void shouldReportAllCookiesInOneHeader() {
     assertEquals("myCookie=myValue; myOtherCookie=myOtherValue", cookie);
   }
 
-  @Test
-  void shouldReportPostDataFor403Request() throws InterruptedException, ExecutionException {
+  @PlaywrightTest
+  void shouldReportPostDataFor403Request(Page page, Server server) throws InterruptedException, ExecutionException {
     server.setRoute("/upload", exchange -> {
       exchange.sendResponseHeaders(403, 0);
       exchange.getResponseBody().close();
@@ -122,8 +127,8 @@ void shouldReportPostDataFor403Request() throws InterruptedException, ExecutionE
     assertEquals(403, request.response().status());
   }
 
-  @Test
-  void shouldNotAllowToAccessFrameOnPopupMainRequest() {
+  @PlaywrightTest
+  void shouldNotAllowToAccessFrameOnPopupMainRequest(Page page, Server server) {
     page.setContent("<a target=_blank href='" + server.EMPTY_PAGE + "'>click me</a>");
     Request[] request = { null };
     PlaywrightException[] error = { null };
@@ -136,13 +141,13 @@ void shouldNotAllowToAccessFrameOnPopupMainRequest() {
       }
     });
     page.getByText("click me").click();
-    waitForCondition(() -> request[0] != null);
+    waitForCondition(page, () -> request[0] != null);
     assertTrue(request[0].isNavigationRequest());
     assertTrue(error[0].getMessage().contains("Frame for this navigation request is not available"), error[0].getMessage());
   }
 
-  @Test
-  void shouldParseDataIfContentTypeIsApplicationFormUrlEncoded() {
+  @PlaywrightTest
+  void shouldParseDataIfContentTypeIsApplicationFormUrlEncoded(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRoute("/post", exchange -> exchange.close());
     Request[] request = {null};
@@ -153,8 +158,8 @@ void shouldParseDataIfContentTypeIsApplicationFormUrlEncoded() {
     assertEquals("foo=bar&baz=123", request[0].postData());
   }
 
-  @Test
-  void shouldParseDataIfContentTypeIsApplicationFormUrlEncodedCharsetUTF8() {
+  @PlaywrightTest
+  void shouldParseDataIfContentTypeIsApplicationFormUrlEncodedCharsetUTF8(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest("**/post", () -> {
       page.evaluate("() => fetch('./post', {\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java
index a102df53c..f10d32f4f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkResponse.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HttpHeader;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.util.List;
@@ -26,9 +26,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageNetworkResponse extends TestBase {
-  @Test
-  void shouldReportMultipleSetCookieHeaders() {
+public class TestPageNetworkResponse {
+  @PlaywrightTest
+  void shouldReportMultipleSetCookieHeaders(Page page, Server server) {
     server.setRoute("/headers", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "a=b");
       exchange.getResponseHeaders().add("Set-Cookie", "c=d");
@@ -46,8 +46,8 @@ void shouldReportMultipleSetCookieHeaders() {
     assertEquals(asList("a=b", "c=d"), response.headerValues("set-cookie"));
   }
 
-  @Test
-  void shouldRejectResponseFinishedIfPageCloses() {
+  @PlaywrightTest
+  void shouldRejectResponseFinishedIfPageCloses(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRoute("/get", exchange -> {
       // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
@@ -71,8 +71,8 @@ void shouldRejectResponseFinishedIfPageCloses() {
     assertTrue(e.getMessage().contains("closed"), e.getMessage());
   }
 
-  @Test
-  void shouldReturnNullExistingResponseBeforeResponseReceived() {
+  @PlaywrightTest
+  void shouldReturnNullExistingResponseBeforeResponseReceived(Page page, Server server) {
     Request[] capturedRequest = {null};
     page.route("**/*", route -> {
       capturedRequest[0] = route.request();
@@ -83,8 +83,8 @@ void shouldReturnNullExistingResponseBeforeResponseReceived() {
     assertNotNull(capturedRequest[0]);
   }
 
-  @Test
-  void shouldReturnExistingResponseAfterReceived() {
+  @PlaywrightTest
+  void shouldReturnExistingResponseAfterReceived(Page page, Server server) {
     Response[] responses = {null};
     page.onResponse(r -> responses[0] = r);
     page.navigate(server.EMPTY_PAGE);
@@ -92,16 +92,16 @@ void shouldReturnExistingResponseAfterReceived() {
     assertEquals(responses[0], responses[0].request().existingResponse());
   }
 
-  @Test
-  void shouldReturnHttpVersion() {
+  @PlaywrightTest
+  void shouldReturnHttpVersion(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForResponse("**/*", () -> page.navigate(server.EMPTY_PAGE));
     String version = response.httpVersion();
     assertTrue(version.matches("HTTP/[12](\\.[01])?"), "unexpected version: " + version);
   }
 
-  @Test
-  void shouldRejectResponseFinishedIfContextCloses() {
+  @PlaywrightTest
+  void shouldRejectResponseFinishedIfContextCloses(Page page, BrowserContext context, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRoute("/get", exchange -> {
       // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkSizes.java b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkSizes.java
index 339878709..5f428ade5 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkSizes.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageNetworkSizes.java
@@ -16,9 +16,9 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Sizes;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -30,9 +30,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestPageNetworkSizes extends TestBase {
-  @Test
-  void shouldSetBodySizeAndHeadersSize() {
+public class TestPageNetworkSizes {
+  @PlaywrightTest
+  void shouldSetBodySizeAndHeadersSize(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest("**/*", () -> {
       page.evaluate("() => fetch('./get', { method: 'POST', body: '12345' }).then(r => r.text())");
@@ -42,8 +42,8 @@ void shouldSetBodySizeAndHeadersSize() {
     assertTrue(sizes.requestHeadersSize >= 250);
   }
 
-  @Test
-  void shouldSetBodySizeTo0IfThereWasNoBody() {
+  @PlaywrightTest
+  void shouldSetBodySizeTo0IfThereWasNoBody(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest("**/*",
       () -> page.evaluate("() => fetch('./get').then(r => r.text())"));
@@ -52,8 +52,8 @@ void shouldSetBodySizeTo0IfThereWasNoBody() {
     assertTrue(sizes.requestHeadersSize >= 200);
   }
 
-  @Test
-  void shouldSetBodySizeHeadersSizeAndTransferSize() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSetBodySizeHeadersSizeAndTransferSize(Page page, Server server) throws ExecutionException, InterruptedException {
     server.setRoute("/get", exchange -> {
       // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
       // from server.
@@ -74,16 +74,16 @@ void shouldSetBodySizeHeadersSizeAndTransferSize() throws ExecutionException, In
     assertTrue(sizes.responseHeadersSize > 10);
   }
 
-  @Test
-  void shouldSetBodySizeTo0WhenThereWasNoResponseBody() {
+  @PlaywrightTest
+  void shouldSetBodySizeTo0WhenThereWasNoResponseBody(Page page, Server server) {
     Response response = page.navigate(server.EMPTY_PAGE);
     Sizes sizes = response.request().sizes();
     assertEquals(0, sizes.responseBodySize);
     assertTrue(sizes.responseHeadersSize > 10, "" + sizes.responseHeadersSize);
   }
 
-  @Test
-  void shouldHaveTheCorrectResponseBodySize() throws IOException {
+  @PlaywrightTest
+  void shouldHaveTheCorrectResponseBodySize(Page page, Server server) throws IOException {
     Response response = page.navigate(server.PREFIX + "/simplezip.json");
     Sizes sizes = response.request().sizes();
     assertEquals(Files.size(Paths.get("src/test/resources/simplezip.json")), sizes.responseBodySize);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestContinue.java b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestContinue.java
index f715dd13a..a272228d0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestContinue.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestContinue.java
@@ -16,9 +16,9 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.HttpHeader;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.io.OutputStreamWriter;
 import java.util.HashMap;
@@ -26,12 +26,13 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageRequestContinue extends TestBase {
-  @Test
-  void shouldDeleteHeaderWithUndefinedValue() throws ExecutionException, InterruptedException {
+public class TestPageRequestContinue {
+  @PlaywrightTest
+  void shouldDeleteHeaderWithUndefinedValue(Page page, Server server) throws ExecutionException, InterruptedException {
     // https://github.com/microsoft/playwright/issues/13106
     page.navigate(server.PREFIX + "/empty.html");
     Future<Server.Request> serverRequest = server.futureRequest("/something");
@@ -67,8 +68,8 @@ void shouldDeleteHeaderWithUndefinedValue() throws ExecutionException, Interrupt
     assertEquals(asList("b"), serverRequest.get().headers.get("bar"));
   }
 
-  @Test
-  void shouldNotThrowWhenContinuingAfterPageIsClosed() {
+  @PlaywrightTest
+  void shouldNotThrowWhenContinuingAfterPageIsClosed(Page page, Server server) {
     boolean[] done = {false};
     page.route("**/*", route -> {
       page.close();
@@ -81,9 +82,9 @@ void shouldNotThrowWhenContinuingAfterPageIsClosed() {
     assertTrue(done[0]);
   }
 
-  @Test
-  @DisabledIf(value = "com.microsoft.playwright.TestBase#isFirefox", disabledReason = "We currently clear all headers during interception in firefox")
-  void continueShouldNotPropagateCookieOverrideToRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "We currently clear all headers during interception in firefox")
+  void continueShouldNotPropagateCookieOverrideToRedirects(Page page, Server server) throws ExecutionException, InterruptedException {
     // https://github.com/microsoft/playwright/issues/35168
     server.setRoute("/set-cookie", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "foo=bar;");
@@ -105,9 +106,9 @@ void continueShouldNotPropagateCookieOverrideToRedirects() throws ExecutionExcep
     assertEquals(asList("foo=bar"), serverRequest.get().headers.get("cookie"));
   }
 
-  @Test
-  @DisabledIf(value = "com.microsoft.playwright.TestBase#isFirefox", disabledReason = "We currently clear all headers during interception in firefox")
-  void continueShouldNotOverrideCookie() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "We currently clear all headers during interception in firefox")
+  void continueShouldNotOverrideCookie(Page page, Server server) throws ExecutionException, InterruptedException {
     // https://github.com/microsoft/playwright/issues/35168
     server.setRoute("/set-cookie", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "foo=bar;");
@@ -132,8 +133,8 @@ void continueShouldNotOverrideCookie() throws ExecutionException, InterruptedExc
     assertEquals(asList("value"), serverRequest.get().headers.get("custom"));
   }
 
-  @Test
-  void redirectAfterContinueShouldBeAbleToDeleteCookie() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void redirectAfterContinueShouldBeAbleToDeleteCookie(Page page, Server server) throws ExecutionException, InterruptedException {
     // https://github.com/microsoft/playwright/issues/35168
     server.setRoute("/set-cookie", exchange -> {
       exchange.getResponseHeaders().add("Set-Cookie", "foo=bar;");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFallback.java b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFallback.java
index e3d280a2f..055dca344 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFallback.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFallback.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.io.OutputStreamWriter;
 import java.io.Writer;
@@ -30,15 +30,15 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageRequestFallback extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageRequestFallback {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.route("**/*", route -> route.fallback());
     page.navigate(server.EMPTY_PAGE);
   }
 
-  @Test
-  void shouldFallBack() {
+  @PlaywrightTest
+  void shouldFallBack(Page page, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     page.route("**/empty.html", route -> {
       intercepted.add(1);
@@ -56,8 +56,8 @@ void shouldFallBack() {
     assertEquals(asList(3, 2, 1), intercepted);
   }
 
-  @Test
-  void shouldFallBackAsync() {
+  @PlaywrightTest
+  void shouldFallBackAsync(Page page, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     page.route("**/empty.html", route -> {
       intercepted.add(1);
@@ -78,8 +78,8 @@ void shouldFallBackAsync() {
     assertEquals(asList(3, 2, 1), intercepted);
   }
 
-  @Test
-  void shouldNotChainFulfill() {
+  @PlaywrightTest
+  void shouldNotChainFulfill(Page page, Server server) {
     boolean[] failed = {false};
     page.route("**/empty.html", route -> {
       failed[0] = true;
@@ -95,8 +95,8 @@ void shouldNotChainFulfill() {
     assertFalse(failed[0]);
   }
 
-  @Test
-  void shouldNotChainAbort() {
+  @PlaywrightTest
+  void shouldNotChainAbort(Page page, Server server) {
     boolean[] failed = {false};
     page.route("**/empty.html", route -> {
       failed[0] = true;
@@ -111,8 +111,8 @@ void shouldNotChainAbort() {
     assertFalse(failed[0]);
   }
 
-  @Test
-  void shouldFallBackAfterException() {
+  @PlaywrightTest
+  void shouldFallBackAfterException(Page page, Server server) {
     page.route("**/empty.html", route -> {
       route.resume();
     });
@@ -126,8 +126,8 @@ void shouldFallBackAfterException() {
     page.navigate(server.EMPTY_PAGE);
   }
 
-  @Test
-  void shouldChainOnce() {
+  @PlaywrightTest
+  void shouldChainOnce(Page page, Server server) {
     boolean didFulfill[] = {false};
     page.route("**/title.html", route -> {
       route.fulfill(new Route.FulfillOptions().setStatus(200).setBody("fulfilled one"));
@@ -141,8 +141,8 @@ void shouldChainOnce() {
     assertEquals("fulfilled one", response.text());
   }
 
-  @Test
-  void shouldAmendHTTPHeaders() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendHTTPHeaders(Page page, Server server) throws ExecutionException, InterruptedException {
     List<String> values = new ArrayList<>();
     page.route("**/sleep.zzz", route -> {
       values.add(route.request().headers().get("foo"));
@@ -161,8 +161,8 @@ void shouldAmendHTTPHeaders() throws ExecutionException, InterruptedException {
     assertEquals(asList("bar", "bar", "bar"), values);
   }
 
-  @Test
-  void shouldDeleteHeaderWithUndefinedValue() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldDeleteHeaderWithUndefinedValue(Page page, Server server) throws ExecutionException, InterruptedException {
     // https://github.com/microsoft/playwright/issues/13106
     page.navigate(server.PREFIX + "/empty.html");
     Future<Server.Request> serverRequest = server.futureRequest("/something");
@@ -201,8 +201,8 @@ void shouldDeleteHeaderWithUndefinedValue() throws ExecutionException, Interrupt
     assertEquals(asList("b"), serverRequest.get().headers.get("bar"));
   }
 
-  @Test
-  void shouldAmendMethod() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendMethod(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> sRequest = server.futureRequest("/sleep.zzz");
     page.navigate(server.EMPTY_PAGE);
     String[] method = {null};
@@ -217,8 +217,8 @@ void shouldAmendMethod() throws ExecutionException, InterruptedException {
     assertEquals("POST", sRequest.get().method);
   }
 
-  @Test
-  void shouldOverrideRequestUrl() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldOverrideRequestUrl(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/global-var.html");
     String[] url = {null};
     page.route("**/global-var.html", route -> {
@@ -234,8 +234,8 @@ void shouldOverrideRequestUrl() throws ExecutionException, InterruptedException
     assertEquals("GET", request.get().method);
   }
 
-  @Test
-  void shouldAmendPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendPostData(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     String[] postData = {null};
     page.route("**/*", route -> {
@@ -251,8 +251,8 @@ void shouldAmendPostData() throws ExecutionException, InterruptedException {
     assertEquals("doggo", new String(serverRequest.get().postBody, StandardCharsets.UTF_8));
   }
 
-  @Test
-  void shouldAmendBinaryPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendBinaryPostData(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     byte[] arr = new byte[256];
     for (int i = 0; i < arr.length; i++) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFulfill.java b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFulfill.java
index 3f1781e74..b020ed24f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFulfill.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestFulfill.java
@@ -16,14 +16,14 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestPageRequestFulfill extends TestBase {
-  @Test
-  void shouldFulfillWithGlobalFetchResult() {
+public class TestPageRequestFulfill {
+  @PlaywrightTest
+  void shouldFulfillWithGlobalFetchResult(Page page, Playwright playwright, Server server) {
     page.route("**/*", route -> {
       APIRequestContext request = playwright.request().newContext();
       APIResponse response = request.get(server.PREFIX + "/simple.json");
@@ -35,8 +35,8 @@ void shouldFulfillWithGlobalFetchResult() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void shouldFulfillWithFetchResult() {
+  @PlaywrightTest
+  void shouldFulfillWithFetchResult(Page page, Server server) {
     page.route("**/*", route -> {
       APIResponse response = page.request().get(server.PREFIX + "/simple.json");
       route.fulfill(new Route.FulfillOptions().setResponse(response));
@@ -47,8 +47,8 @@ void shouldFulfillWithFetchResult() {
     assertEquals("{\"foo\": \"bar\"}\n", response.text());
   }
 
-  @Test
-  void shouldFulfillWithFetchResultAndOverrides() {
+  @PlaywrightTest
+  void shouldFulfillWithFetchResultAndOverrides(Page page, Server server) {
     page.route("**/*", route -> {
       APIResponse response = page.request().get(server.PREFIX + "/simple.json");
       route.fulfill(new Route.FulfillOptions().setResponse(response)
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestIntercept.java b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestIntercept.java
index 7d5db90ea..dcf223984 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageRequestIntercept.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageRequestIntercept.java
@@ -16,13 +16,13 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
-public class TestPageRequestIntercept extends TestBase {
-  @Test
-  void shouldFulfillPopupMainRequestUsingAlias() {
+public class TestPageRequestIntercept {
+  @PlaywrightTest
+  void shouldFulfillPopupMainRequestUsingAlias(Page page, Server server) {
     page.context().route("**/*", route -> {
       APIResponse response = route.fetch();
       route.fulfill(new Route.FulfillOptions().setResponse(response).setBody("hello" ));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java b/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
index 842664dbd..30484ffd0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageRoute.java
@@ -16,9 +16,10 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.*;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
@@ -34,13 +35,16 @@
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageRoute extends TestBase {
+public class TestPageRoute {
 
-  @Test
-  void shouldIntercept() {
+  @PlaywrightTest
+  void shouldIntercept(Page page, Server server) {
     boolean[] intercepted = {false};
     page.route("**/empty.html", route -> {
       Request request = route.request();
@@ -62,8 +66,8 @@ void shouldIntercept() {
   }
 
 
-  @Test
-  void shouldUnroute() {
+  @PlaywrightTest
+  void shouldUnroute(Page page, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     page.route("**/*", route -> {
       intercepted.add(1);
@@ -97,8 +101,8 @@ void shouldUnroute() {
     assertEquals(asList(1), intercepted);
   }
 
-  @Test
-  void shouldUnrouteNonExistentPatternHandler() {
+  @PlaywrightTest
+  void shouldUnrouteNonExistentPatternHandler(Page page, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     page.route(Pattern.compile("empty.html"), route -> {
       intercepted.add(1);
@@ -109,8 +113,8 @@ void shouldUnrouteNonExistentPatternHandler() {
     assertEquals(asList( 1), intercepted);
   }
 
-  @Test
-  void shouldNotSupportQuestionMarkInGlobPattern() {
+  @PlaywrightTest
+  void shouldNotSupportQuestionMarkInGlobPattern(Page page, Server server) {
     server.setRoute("/index", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
@@ -158,8 +162,8 @@ void shouldNotSupportQuestionMarkInGlobPattern() {
     assertTrue(page.content().contains("index123hello"), page.content());
   }
 
-  @Test
-  void shouldUnroutePredicate() {
+  @PlaywrightTest
+  void shouldUnroutePredicate(Page page, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     Predicate<String> predicate = r -> true;
     page.route(predicate, route -> {
@@ -190,8 +194,8 @@ void shouldUnroutePredicate() {
     assertEquals(asList(), intercepted);
   }
 
-  @Test
-  void shouldWorkWhenPOSTIsRedirectedWith302() {
+  @PlaywrightTest
+  void shouldWorkWhenPOSTIsRedirectedWith302(Page page, Server server) {
     server.setRedirect("/rredirect", "/empty.html");
     page.navigate(server.EMPTY_PAGE);
     page.route("**/*", route -> route.resume());
@@ -202,8 +206,8 @@ void shouldWorkWhenPOSTIsRedirectedWith302() {
   }
 
   // @see https://github.com/GoogleChrome/puppeteer/issues/3973
-  @Test
-  void shouldWorkWhenHeaderManipulationHeadersWithRedirect() {
+  @PlaywrightTest
+  void shouldWorkWhenHeaderManipulationHeadersWithRedirect(Page page, Server server) {
     server.setRedirect("/rrredirect", "/empty.html");
     page.route("**/*", route -> {
       Map<String, String> headers = new HashMap<>(route.request().headers());
@@ -214,8 +218,8 @@ void shouldWorkWhenHeaderManipulationHeadersWithRedirect() {
   }
 
   // @see https://github.com/GoogleChrome/puppeteer/issues/4743
-  @Test
-  void shouldBeAbleToRemoveHeaders() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldBeAbleToRemoveHeaders(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.PREFIX + "/empty.html");
     page.route("**/*", route -> {
       Map<String, String> headers = new HashMap<>(route.request().headers());
@@ -228,8 +232,8 @@ void shouldBeAbleToRemoveHeaders() throws ExecutionException, InterruptedExcepti
     assertFalse(serverRequest.get().headers.containsKey("foo"));
   }
 
-  @Test
-  void shouldContainRefererHeader() {
+  @PlaywrightTest
+  void shouldContainRefererHeader(Page page, Server server) {
     List<Request> requests = new ArrayList<>();
     page.route("**/*", route -> {
       requests.add(route.request());
@@ -241,8 +245,8 @@ void shouldContainRefererHeader() {
     assertTrue(requests.get(1).headers().get("referer").contains("/one-style.html"));
   }
 
-  @Test
-  void shouldProperlyReturnNavigationResponseWhenURLHasCookies() {
+  @PlaywrightTest
+  void shouldProperlyReturnNavigationResponseWhenURLHasCookies(Page page, BrowserContext context, Server server) {
     // Setup cookie.
     page.navigate(server.EMPTY_PAGE);
     context.addCookies(asList(new Cookie("foo", "bar")
@@ -253,8 +257,8 @@ void shouldProperlyReturnNavigationResponseWhenURLHasCookies() {
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldShowCustomHTTPHeaders() {
+  @PlaywrightTest
+  void shouldShowCustomHTTPHeaders(Page page, Server server) {
     page.setExtraHTTPHeaders(mapOf("foo", "bar"));
     page.route("**/*", route -> {
       assertEquals("bar", route.request().headers().get("foo"));
@@ -265,9 +269,9 @@ void shouldShowCustomHTTPHeaders() {
   }
 
   // @see https://github.com/GoogleChrome/puppeteer/issues/4337
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="fixme")
-  void shouldWorkWithRedirectInsideSyncXHR() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "fixme")
+  void shouldWorkWithRedirectInsideSyncXHR(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     server.setRedirect("/logo.png", "/pptr.png");
     page.route("**/*", route -> route.resume());
@@ -280,8 +284,8 @@ void shouldWorkWithRedirectInsideSyncXHR() {
     assertEquals(200, status);
   }
 
-  @Test
-  void shouldWorkWithCustomRefererHeaders() {
+  @PlaywrightTest
+  void shouldWorkWithCustomRefererHeaders(Page page, Server server) {
     page.setExtraHTTPHeaders(mapOf("referer", server.EMPTY_PAGE));
     page.route("**/*", route -> {
       String referer = route.request().headers().get("referer");
@@ -293,8 +297,8 @@ void shouldWorkWithCustomRefererHeaders() {
     assertTrue(response.ok());
   }
 
-  @Test
-  void shouldBeAbortable() {
+  @PlaywrightTest
+  void shouldBeAbortable(Page page, Server server) {
     page.route(Pattern.compile(".*\\.css$"), route -> route.abort());
     boolean[] failed = {false};
     page.onRequestFailed(request -> {
@@ -307,24 +311,24 @@ void shouldBeAbortable() {
     assertTrue(failed[0]);
   }
 
-  @Test
-  void shouldBeAbortableWithCustomErrorCodes() {
+  @PlaywrightTest
+  void shouldBeAbortableWithCustomErrorCodes(Page page, Server server, BrowserName browserName) {
     page.route("**/*", route -> route.abort("internetdisconnected"));
     Request[] failedRequest = {null};
     page.onRequestFailed(r -> failedRequest[0] = r);
     assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
     assertNotNull(failedRequest[0]);
-    if (isWebKit()) {
+    if (browserName == WEBKIT) {
       assertEquals("Blocked by Web Inspector", failedRequest[0].failure());
-    } else if (isFirefox()) {
+    } else if (browserName == FIREFOX) {
       assertEquals("NS_ERROR_OFFLINE", failedRequest[0].failure());
     } else {
       assertEquals("net::ERR_INTERNET_DISCONNECTED", failedRequest[0].failure());
     }
   }
 
-  @Test
-  void shouldSendReferer() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldSendReferer(Page page, Server server) throws ExecutionException, InterruptedException {
     page.setExtraHTTPHeaders(mapOf("referer", "http://google.com/"));
     page.route("**/*", route -> route.resume());
     Future<Server.Request> request = server.futureRequest("/grid.html");
@@ -332,21 +336,21 @@ void shouldSendReferer() throws ExecutionException, InterruptedException {
     assertEquals(asList("http://google.com/"), request.get().headers.get("referer"));
   }
 
-  @Test
-  void shouldFailNavigationWhenAbortingMainResource() {
+  @PlaywrightTest
+  void shouldFailNavigationWhenAbortingMainResource(Page page, Server server, BrowserName browserName) {
     page.route("**/*", route -> route.abort());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
-    if (isWebKit())
+    if (browserName == WEBKIT)
       assertTrue(e.getMessage().contains("Blocked by Web Inspector"), e.getMessage());
-    else if (isFirefox())
+    else if (browserName == FIREFOX)
       assertTrue(e.getMessage().contains("NS_ERROR_FAILURE"));
     else
       assertTrue(e.getMessage().contains("net::ERR_FAILED"));
   }
 
 
-  @Test
-  void shouldNotWorkWithRedirects() {
+  @PlaywrightTest
+  void shouldNotWorkWithRedirects(Page page, Server server) {
     List<Request> intercepted = new ArrayList<>();
     page.route("**/*", route -> {
       route.resume();
@@ -382,8 +386,8 @@ void shouldNotWorkWithRedirects() {
     }
   }
 
-  @Test
-  void shouldWorkWithRedirectsForSubresources() {
+  @PlaywrightTest
+  void shouldWorkWithRedirectsForSubresources(Page page, Server server, BrowserName browserName) {
     List<Request> intercepted = new ArrayList<>();
     page.route("**/*", route -> {
       route.resume();
@@ -403,7 +407,7 @@ void shouldWorkWithRedirectsForSubresources() {
     assertTrue(response.url().contains("one-style.html"));
 
     // In firefox one-style.css is requested multiple times.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertTrue(intercepted.size() > 1);
     } else {
       assertEquals(2, intercepted.size());
@@ -420,8 +424,8 @@ void shouldWorkWithRedirectsForSubresources() {
     assertNull(r);
   }
 
-  @Test
-  void shouldWorkWithEqualRequests() {
+  @PlaywrightTest
+  void shouldWorkWithEqualRequests(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     AtomicInteger responseCount = new AtomicInteger(1);
     server.setRoute("/zzz", exchange -> {
@@ -448,8 +452,8 @@ void shouldWorkWithEqualRequests() {
     assertEquals(asList("11", "FAILED", "22"), results);
   }
 
-  @Test
-  void shouldNavigateToDataURLAndNotFireDataURLRequests() {
+  @PlaywrightTest
+  void shouldNavigateToDataURLAndNotFireDataURLRequests(Page page) {
     List<Request> requests = new ArrayList<>();
     page.route("**/*", route -> {
       requests.add(route.request());
@@ -461,8 +465,8 @@ void shouldNavigateToDataURLAndNotFireDataURLRequests() {
     assertEquals(0, requests.size());
   }
 
-  @Test
-  void shouldBeAbleToFetchDataURLAndNotFireDataURLRequests() {
+  @PlaywrightTest
+  void shouldBeAbleToFetchDataURLAndNotFireDataURLRequests(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     List<Request> requests = new ArrayList<>();
     page.route("**/*", route -> {
@@ -475,8 +479,8 @@ void shouldBeAbleToFetchDataURLAndNotFireDataURLRequests() {
     assertEquals(0, requests.size());
   }
 
-  @Test
-  void shouldNavigateToURLWithHashAndAndFireRequestsWithoutHash() {
+  @PlaywrightTest
+  void shouldNavigateToURLWithHashAndAndFireRequestsWithoutHash(Page page, Server server) {
     List<Request> requests = new ArrayList<>();
     page.route("**/*", route -> {
       requests.add(route.request());
@@ -489,8 +493,8 @@ void shouldNavigateToURLWithHashAndAndFireRequestsWithoutHash() {
     assertEquals(server.EMPTY_PAGE, requests.get(0).url());
   }
 
-  @Test
-  void shouldWorkWithEncodedServer() throws InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithEncodedServer(Page page, Server server) throws InterruptedException {
     // The requestWillBeSent will report encoded URL, whereas interception will
     // report URL as-is. @see crbug.com/759388
     page.route("**/*", route -> route.resume());
@@ -498,8 +502,8 @@ void shouldWorkWithEncodedServer() throws InterruptedException {
     assertEquals(404, response.status());
   }
 
-  @Test
-  void shouldWorkWithBadlyEncodedServer() {
+  @PlaywrightTest
+  void shouldWorkWithBadlyEncodedServer(Page page, Server server) {
     server.setRoute("/malformed", exchange -> {
       exchange.sendResponseHeaders(200, 0);
       exchange.getResponseBody().close();
@@ -509,8 +513,8 @@ void shouldWorkWithBadlyEncodedServer() {
     assertEquals(200, response.status());
   }
 
-  @Test
-  void shouldWorkWithEncodedServer2() {
+  @PlaywrightTest
+  void shouldWorkWithEncodedServer2(Page page, Server server, BrowserName browserName) {
     // The requestWillBeSent will report URL as-is, whereas interception will
     // report encoded URL for stylesheet. @see crbug.com/759388
     List<Request> requests = new ArrayList<>();
@@ -521,7 +525,7 @@ void shouldWorkWithEncodedServer2() {
     Response response = page.navigate("data:text/html,<link rel='stylesheet' href='" + server.PREFIX + "/fonts?helvetica|arial'/>");
     assertNull(response);
     // In firefox linked resource is requested multiple times.
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertTrue(requests.size() > 0);
     } else {
       assertEquals(1, requests.size());
@@ -530,8 +534,8 @@ void shouldWorkWithEncodedServer2() {
     // assertEquals(404, requests.get(0).response().status());
   }
 
-  @Test
-  void shouldNotThrowIfResumeIsCalledAfterRouteHandlerFinished() {
+  @PlaywrightTest
+  void shouldNotThrowIfResumeIsCalledAfterRouteHandlerFinished(Page page, Server server) {
     page.setContent("<iframe></iframe>");
     Route[] route = {null};
     page.route("**/*", r -> route[0] = r);
@@ -542,8 +546,8 @@ void shouldNotThrowIfResumeIsCalledAfterRouteHandlerFinished() {
     route[0].resume();
   }
 
-  @Test
-  void shouldInterceptMainResourceDuringCrossProcessNavigation() {
+  @PlaywrightTest
+  void shouldInterceptMainResourceDuringCrossProcessNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     boolean[] intercepted = {false};
     page.route(server.CROSS_PROCESS_PREFIX + "/empty.html", route -> {
@@ -555,9 +559,9 @@ void shouldInterceptMainResourceDuringCrossProcessNavigation() {
     assertTrue(intercepted[0]);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="fixme")
-  void shouldFulfillWithRedirectStatus() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = WEBKIT, reason = "fixme")
+  void shouldFulfillWithRedirectStatus(Page page, Server server) {
     page.navigate(server.PREFIX + "/title.html");
     server.setRoute("/final", exchange -> {
       exchange.sendResponseHeaders(200, 0);
@@ -581,8 +585,8 @@ void shouldFulfillWithRedirectStatus() {
     assertEquals("", text);
   }
 
-  @Test
-  void shouldSupportCorsWithGET() {
+  @PlaywrightTest
+  void shouldSupportCorsWithGET(Page page, Server server, BrowserName browserName) {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/cars*", route -> {
       Map<String, String> headers = new HashMap<>();
@@ -611,19 +615,19 @@ void shouldSupportCorsWithGET() {
           "  return response.json();\n" +
           "}");
       });
-      if (isChromium()) {
+      if (browserName == CHROMIUM) {
         assertTrue(e.getMessage().contains("Failed"), e.getMessage());
-      } else if (isWebKit()) {
+      } else if (browserName == WEBKIT) {
         assertTrue(e.getMessage().contains("TypeError"), e.getMessage());
-      } else if (isFirefox()) {
+      } else if (browserName == FIREFOX) {
         assertTrue(e.getMessage().contains("NetworkError"), e.getMessage());
       }
     }
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="https://github.com/microsoft/playwright/issues/6016")
-  void shouldSupportCorsWithPOST() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, reason = "https://github.com/microsoft/playwright/issues/6016")
+  void shouldSupportCorsWithPOST(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/cars", route -> {
       route.fulfill(new Route.FulfillOptions()
@@ -644,9 +648,9 @@ void shouldSupportCorsWithPOST() {
     assertEquals(asList("electric", "gas"), resp);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="https://github.com/microsoft/playwright/issues/6016")
-  void shouldSupportCorsWithCredentials() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, reason = "https://github.com/microsoft/playwright/issues/6016")
+  void shouldSupportCorsWithCredentials(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/cars", route -> {
       route.fulfill(new Route.FulfillOptions()
@@ -669,8 +673,8 @@ void shouldSupportCorsWithCredentials() {
     assertEquals(asList("electric", "gas"), resp);
   }
 
-  @Test
-  void shouldRejectCorsWithDisallowedCredentials() {
+  @PlaywrightTest
+  void shouldRejectCorsWithDisallowedCredentials(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/cars", route -> {
       route.fulfill(new Route.FulfillOptions()
@@ -695,9 +699,9 @@ void shouldRejectCorsWithDisallowedCredentials() {
     });
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="https://github.com/microsoft/playwright/issues/6016")
-  void shouldSupportCorsForDifferentMethods() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, reason = "https://github.com/microsoft/playwright/issues/6016")
+  void shouldSupportCorsForDifferentMethods(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/cars", route -> {
       route.fulfill(new Route.FulfillOptions()
@@ -734,8 +738,8 @@ void shouldSupportCorsForDifferentMethods() {
     }
   }
 
-  @Test
-  void shouldSupportTheTimesParameterWithRouteMatching() {
+  @PlaywrightTest
+  void shouldSupportTheTimesParameterWithRouteMatching(Page page, Server server) {
     int[] intercepted = {0};
     page.route("**/empty.html", route -> {
       ++intercepted[0];
@@ -747,8 +751,8 @@ void shouldSupportTheTimesParameterWithRouteMatching() {
     assertEquals(1, intercepted[0]);
   }
 
-  @Test
-  void shouldAddAccessControlAllowOriginByDefaultWhenFulfill() {
+  @PlaywrightTest
+  void shouldAddAccessControlAllowOriginByDefaultWhenFulfill(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/cars", route -> {
       route.fulfill(new Route.FulfillOptions()
@@ -772,8 +776,8 @@ void shouldAddAccessControlAllowOriginByDefaultWhenFulfill() {
     assertEquals(server.PREFIX, response.headerValue("Access-Control-Allow-Origin"));
   }
 
-  @Test
-  void shouldChainFallbackWDynamicURL() {
+  @PlaywrightTest
+  void shouldChainFallbackWDynamicURL(Page page, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     page.route("**/bar", route -> {
       intercepted.add(1);
@@ -793,8 +797,8 @@ void shouldChainFallbackWDynamicURL() {
     assertEquals(asList(3, 2, 1), intercepted);
   }
 
-  @Test
-  void shouldAllowToCallRouteAsynchronously() {
+  @PlaywrightTest
+  void shouldAllowToCallRouteAsynchronously(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Route[] route = new Route[] { null };
     page.route("**/cars", r -> {
@@ -823,8 +827,8 @@ void shouldAllowToCallRouteAsynchronously() {
     assertEquals("Hi!", response);
   }
 
-  @Test
-  void shouldResumeIfFallbackIsCalledAsynchronously() {
+  @PlaywrightTest
+  void shouldResumeIfFallbackIsCalledAsynchronously(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Route[] route = new Route[] { null };
     page.route("**/simple.json", r -> {
@@ -850,8 +854,8 @@ void shouldResumeIfFallbackIsCalledAsynchronously() {
     assertEquals("{\"foo\": \"bar\"}\n", response);
   }
 
-  @Test
-  void shouldContinueIfAllHandlersCalledFallback() {
+  @PlaywrightTest
+  void shouldContinueIfAllHandlersCalledFallback(Page page, BrowserContext context, Server server) {
     List<Integer> intercepted = new ArrayList<>();
     Predicate<String> predicate = r -> true;
     page.route(predicate, route -> {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java b/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java
index 9ba228b5e..8f07b5e73 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageScreenshot.java
@@ -16,14 +16,17 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.Clip;
 import com.microsoft.playwright.options.ScreenshotAnimations;
 import com.microsoft.playwright.options.ScreenshotCaret;
 import com.microsoft.playwright.options.ScreenshotScale;
 import com.microsoft.playwright.options.ScreenshotType;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.io.TempDir;
 import org.opentest4j.AssertionFailedError;
 
@@ -37,15 +40,18 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static com.microsoft.playwright.options.ScreenshotAnimations.DISABLED;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 // TODO: suite.skip(browserName === "firefox" && headed");
-public class TestPageScreenshot extends TestBase {
-  @Test
-  void shouldWork() throws IOException {
+public class TestPageScreenshot {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) throws IOException {
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     byte[] screenshot = page.screenshot();
@@ -55,8 +61,8 @@ void shouldWork() throws IOException {
 //    expect(screenshot).toMatchSnapshot("screenshot-sanity.png");
   }
 
-  @Test
-  void shouldClipRect() throws IOException {
+  @PlaywrightTest
+  void shouldClipRect(Page page, Server server) throws IOException {
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     byte[] screenshot = page.screenshot(new Page.ScreenshotOptions()
@@ -74,16 +80,16 @@ private static void assertWebp(byte[] screenshot) {
     assertEquals("WEBP", new String(screenshot, 8, 4, java.nio.charset.StandardCharsets.US_ASCII));
   }
 
-  @Test
-  void shouldProduceAValidWebpScreenshot() {
+  @PlaywrightTest
+  void shouldProduceAValidWebpScreenshot(Page page, Server server) {
     page.setViewportSize(300, 300);
     page.navigate(server.EMPTY_PAGE);
     byte[] screenshot = page.screenshot(new Page.ScreenshotOptions().setType(ScreenshotType.WEBP));
     assertWebp(screenshot);
   }
 
-  @Test
-  void pathOptionShouldDetectWebp(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void pathOptionShouldDetectWebp(Page page, Server server, @TempDir Path tmpDir) throws IOException {
     page.setViewportSize(300, 300);
     page.navigate(server.EMPTY_PAGE);
     Path outputPath = tmpDir.resolve("screenshot.webp");
@@ -92,8 +98,8 @@ void pathOptionShouldDetectWebp(@TempDir Path tmpDir) throws IOException {
     assertWebp(Files.readAllBytes(outputPath));
   }
 
-  @Test
-  void qualityOptionShouldWorkForWebp() {
+  @PlaywrightTest
+  void qualityOptionShouldWorkForWebp(Page page, Server server) {
     page.navigate(server.PREFIX + "/grid.html");
     byte[] lowQuality = page.screenshot(new Page.ScreenshotOptions().setType(ScreenshotType.WEBP).setQuality(0));
     byte[] highQuality = page.screenshot(new Page.ScreenshotOptions().setType(ScreenshotType.WEBP).setQuality(100));
@@ -108,8 +114,8 @@ static private void rafraf(Page page) {
       "  })");
   }
 
-  @Test
-  void shouldNotCaptureInfiniteCssAnimation() {
+  @PlaywrightTest
+  void shouldNotCaptureInfiniteCssAnimation(Page page, Server server) {
     page.navigate(server.PREFIX + "/rotate-z.html");
     Locator div = page.locator("div");
     byte[] screenshot = div.screenshot(new Locator.ScreenshotOptions().setAnimations(DISABLED));
@@ -120,8 +126,8 @@ void shouldNotCaptureInfiniteCssAnimation() {
     }
   }
 
-  @Test
-  void shouldNotCapturePseudoElementCssAnimation() {
+  @PlaywrightTest
+  void shouldNotCapturePseudoElementCssAnimation(Page page, Server server) {
     page.navigate(server.PREFIX + "/rotate-pseudo.html");
     Locator div = page.locator("div");
     byte[] screenshot = div.screenshot(new Locator.ScreenshotOptions().setAnimations(DISABLED));
@@ -132,8 +138,8 @@ void shouldNotCapturePseudoElementCssAnimation() {
     }
   }
 
-  @Test
-  void shouldNotCaptureCssAnimationsInShadowDOM() {
+  @PlaywrightTest
+  void shouldNotCaptureCssAnimationsInShadowDOM(Page page, Server server) {
     page.navigate(server.PREFIX + "/rotate-z-shadow-dom.html");
     byte[] screenshot = page.screenshot(new Page.ScreenshotOptions().setAnimations(DISABLED));
     for (int i = 0; i < 10; ++i) {
@@ -143,8 +149,8 @@ void shouldNotCaptureCssAnimationsInShadowDOM() {
     }
   }
 
-  @Test
-  void shouldResumeInfiniteAnimations() {
+  @PlaywrightTest
+  void shouldResumeInfiniteAnimations(Page page, Server server) {
     page.navigate(server.PREFIX + "/rotate-z.html");
     page.screenshot(new Page.ScreenshotOptions().setAnimations(DISABLED));
     byte[] buffer1 = page.screenshot();
@@ -153,8 +159,8 @@ void shouldResumeInfiniteAnimations() {
     assertThrows(AssertionFailedError.class, () -> assertArrayEquals(buffer1, buffer2));
   }
 
-  @Test
-  void shouldNotCaptureInfiniteWebAnimations() {
+  @PlaywrightTest
+  void shouldNotCaptureInfiniteWebAnimations(Page page, Server server) {
     page.navigate(server.PREFIX + "/web-animation.html");
     Locator div = page.locator("div");
     byte[] screenshot = div.screenshot(new Locator.ScreenshotOptions().setAnimations(DISABLED));
@@ -170,8 +176,8 @@ void shouldNotCaptureInfiniteWebAnimations() {
     assertThrows(AssertionFailedError.class, () -> assertArrayEquals(buffer1, buffer2));
   }
 
-  @Test
-  void maskShouldWorkForPage() {
+  @PlaywrightTest
+  void maskShouldWorkForPage(Page page, Server server) {
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     byte[] screenshot = page.screenshot(new Page.ScreenshotOptions()
@@ -181,8 +187,8 @@ void maskShouldWorkForPage() {
     assertThrows(AssertionFailedError.class, () -> assertArrayEquals(screenshot, originalScreenshot));
   }
 
-  @Test
-  void maskShouldWorkForLocator() {
+  @PlaywrightTest
+  void maskShouldWorkForLocator(Page page, Server server) {
     page.navigate(server.PREFIX + "/grid.html");
     Locator locatorToScreenshot = page.locator("div").first();
     byte[] screenshot = locatorToScreenshot.screenshot(new Locator.ScreenshotOptions()
@@ -192,8 +198,8 @@ void maskShouldWorkForLocator() {
     assertThrows(AssertionFailedError.class, () -> assertArrayEquals(screenshot, originalScreenshot));
   }
 
-  @Test
-  void shouldWorkWithDeviceScaleFactorAndClip() {
+  @PlaywrightTest
+  void shouldWorkWithDeviceScaleFactorAndClip(Browser browser, Server server) {
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(500, 500).setDeviceScaleFactor(3))) {
       Page page = context.newPage();
@@ -205,8 +211,8 @@ void shouldWorkWithDeviceScaleFactorAndClip() {
     }
   }
 
-  @Test
-  void shouldWorkWithDeviceScaleFactorAndScaleCss() {
+  @PlaywrightTest
+  void shouldWorkWithDeviceScaleFactorAndScaleCss(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(320, 480).setDeviceScaleFactor(2));
     Page page = context.newPage();
@@ -217,8 +223,8 @@ void shouldWorkWithDeviceScaleFactorAndScaleCss() {
     // expect(screenshot).toMatchSnapshot("screenshot-device-scale-factor-css-size.png");
   }
 
-  @Test
-  void shouldWorkWithDeviceScaleFactorAndScaleDevice() {
+  @PlaywrightTest
+  void shouldWorkWithDeviceScaleFactorAndScaleDevice(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(320, 480).setDeviceScaleFactor(2));
     Page page = context.newPage();
@@ -229,8 +235,8 @@ void shouldWorkWithDeviceScaleFactorAndScaleDevice() {
     // expect(screenshot).toMatchSnapshot("screenshot-device-scale-factor-device-size.png");
   }
 
-  @Test
-  void shouldNotCaptureBlinkingCaretByDefault() {
+  @PlaywrightTest
+  void shouldNotCaptureBlinkingCaretByDefault(Page page, Server server) {
     page.setContent("<!-- Refer to stylesheet from other origin. Accessing this\n" +
       "           stylesheet rules will throw.\n" +
       "      -->\n" +
@@ -255,9 +261,9 @@ void shouldNotCaptureBlinkingCaretByDefault() {
     }
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="fixme")
-  void shouldCaptureBlinkingCaretIfExplicitlyAskedFor() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "fixme")
+  void shouldCaptureBlinkingCaretIfExplicitlyAskedFor(Page page, Server server) {
     page.setContent("      <!-- Refer to stylesheet from other origin. Accessing this\n" +
       "           stylesheet rules will throw.\n" +
       "      -->\n" +
@@ -284,8 +290,8 @@ void shouldCaptureBlinkingCaretIfExplicitlyAskedFor() {
     assertTrue(hasDifferentScreenshots);
   }
 
-  @Test
-  void shouldWorkWhenMaskColorIsNotPinkF0F() {
+  @PlaywrightTest
+  void shouldWorkWhenMaskColorIsNotPinkF0F(Page page, Server server) {
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     byte[] screenshot1 = page.screenshot(
@@ -298,21 +304,21 @@ void shouldWorkWhenMaskColorIsNotPinkF0F() {
     assertThrows(AssertionError.class, () -> assertArrayEquals(screenshot1, screenshot2));
   }
 
-  static boolean isScreenshotTestDisabled() {
-    if (isWebKit() || isChromium()) {
+  static boolean isScreenshotTestDisabled(BrowserName browserName) {
+    if (browserName == WEBKIT || browserName == CHROMIUM) {
       // Array lengths differ.
       return true;
     }
-    if (getBrowserChannelFromEnv() != null) {
+    if (Env.channel() != null) {
       // Stable builds may have different expectations.
       return true;
     }
     return false;
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestPageScreenshot#isScreenshotTestDisabled", disabledReason="array lengths differ")
-  void shouldHideElementsBasedOnAttr() throws IOException {
+  @PlaywrightTest
+  void shouldHideElementsBasedOnAttr(Page page, BrowserType browserType, Server server, BrowserName browserName) throws IOException {
+    Assumptions.assumeFalse(isScreenshotTestDisabled(browserName), "array lengths differ");
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     page.locator("div").nth(5).evaluate("element => {\n" +
@@ -321,14 +327,14 @@ void shouldHideElementsBasedOnAttr() throws IOException {
     byte[] actual = page.screenshot(new Page.ScreenshotOptions().setStyle("[data-test-screenshot=\"hide\"] {\n" +
       "          visibility: hidden;\n" +
       "        }"));
-    assertArrayEquals(expectedScreenshot("hide-should-work"), actual, "Screenshots should match");
+    assertArrayEquals(expectedScreenshot(browserType, "hide-should-work"), actual, "Screenshots should match");
     Object visibility = page.locator("div").nth(5).evaluate("element => element.style.visibility");
     assertEquals("", visibility);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestPageScreenshot#isScreenshotTestDisabled", disabledReason="array lengths differ")
-  void shouldRemoveElementsBasedOnAttr() throws IOException {
+  @PlaywrightTest
+  void shouldRemoveElementsBasedOnAttr(Page page, BrowserType browserType, Server server, BrowserName browserName) throws IOException {
+    Assumptions.assumeFalse(isScreenshotTestDisabled(browserName), "array lengths differ");
     page.setViewportSize(500, 500);
     page.navigate(server.PREFIX + "/grid.html");
     page.locator("div").nth(5).evaluate("element => {\n" +
@@ -337,12 +343,12 @@ void shouldRemoveElementsBasedOnAttr() throws IOException {
     byte[] actual = page.screenshot(new Page.ScreenshotOptions().setStyle("[data-test-screenshot=\"remove\"] {\n" +
       "          display: none;\n" +
       "        }"));
-    assertArrayEquals(expectedScreenshot("remove-should-work"), actual, "Screenshots should match");
+    assertArrayEquals(expectedScreenshot(browserType, "remove-should-work"), actual, "Screenshots should match");
     Object display = page.locator("div").nth(5).evaluate("element => element.style.display");
     assertEquals("", display);
   }
 
-  private byte[] expectedScreenshot(String name) throws IOException {
+  private byte[] expectedScreenshot(BrowserType browserType, String name) throws IOException {
     Path path = Paths.get("src/test/resources/expectations");
     return Files.readAllBytes(path.resolve(name + "-" + browserType.name() + ".png"));
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageSelectOption.java b/playwright/src/test/java/com/microsoft/playwright/TestPageSelectOption.java
index 5250f548c..93ba8d60c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageSelectOption.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageSelectOption.java
@@ -16,76 +16,77 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.SelectOption;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
 
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;
-import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
-public class TestPageSelectOption extends TestBase {
-  @Test
-  void shouldSelectSingleOption() {
+public class TestPageSelectOption {
+  @PlaywrightTest
+  void shouldSelectSingleOption(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", "blue");
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldSelectSingleOptionByValue() {
+  @PlaywrightTest
+  void shouldSelectSingleOptionByValue(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", new SelectOption().setValue("blue"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldFallBackToSelectingByLabel() {
+  @PlaywrightTest
+  void shouldFallBackToSelectingByLabel(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", "Blue");
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldSelectSingleOptionByLabel() {
+  @PlaywrightTest
+  void shouldSelectSingleOptionByLabel(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", new SelectOption().setLabel("Indigo"));
     assertEquals(asList("indigo"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("indigo"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldSelectSingleOptionByHandle() {
+  @PlaywrightTest
+  void shouldSelectSingleOptionByHandle(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", page.querySelector("[id=whiteOption]"));
     assertEquals(asList("white"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("white"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldSelectSingleOptionByIndex() {
+  @PlaywrightTest
+  void shouldSelectSingleOptionByIndex(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", new SelectOption().setIndex(2));
     assertEquals(asList("brown"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("brown"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldSelectSingleOptionByMultipleAttributes() {
+  @PlaywrightTest
+  void shouldSelectSingleOptionByMultipleAttributes(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", new SelectOption().setValue("green").setLabel("Green"));
     assertEquals(asList("green"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("green"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldNotSelectSingleOptionWhenSomeAttributesDoNotMatch() {
+  @PlaywrightTest
+  void shouldNotSelectSingleOptionWhenSomeAttributesDoNotMatch(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evalOnSelector("select", "s => s.value = undefined");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -96,24 +97,24 @@ void shouldNotSelectSingleOptionWhenSomeAttributesDoNotMatch() {
     assertEquals("", page.evaluate("() => document.querySelector('select').value"));
   }
 
-  @Test
-  void shouldSelectOnlyFirstOption() {
+  @PlaywrightTest
+  void shouldSelectOnlyFirstOption(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", new String[]{"blue", "green", "red"});
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onInput"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldNotThrowWhenSelectCausesNavigation() {
+  @PlaywrightTest
+  void shouldNotThrowWhenSelectCausesNavigation(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evalOnSelector("select", "select => select.addEventListener('input', () => window.location.href = '/empty.html')");
     page.waitForNavigation(() -> page.selectOption("select", "blue"));
     assertTrue(page.url().contains("empty.html"));
   }
 
-  @Test
-  void shouldSelectMultipleOptions() {
+  @PlaywrightTest
+  void shouldSelectMultipleOptions(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window['makeMultiple']()");
     page.selectOption("select", new String[]{"blue", "green", "red"});
@@ -121,8 +122,8 @@ void shouldSelectMultipleOptions() {
     assertEquals(asList("blue", "green", "red"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldSelectMultipleOptionsWithAttributes() {
+  @PlaywrightTest
+  void shouldSelectMultipleOptionsWithAttributes(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window['makeMultiple']()");
     page.selectOption("select", new SelectOption[] {
@@ -134,30 +135,30 @@ void shouldSelectMultipleOptionsWithAttributes() {
     assertEquals(asList("blue", "gray", "green"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldRespectEventBubbling() {
+  @PlaywrightTest
+  void shouldRespectEventBubbling(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", "blue");
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onBubblingInput"));
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onBubblingChange"));
   }
 
-  @Test
-  void shouldThrowWhenElementIsNotASelect() {
+  @PlaywrightTest
+  void shouldThrowWhenElementIsNotASelect(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.selectOption("body", ""));
     assertTrue(e.getMessage().contains("Element is not a <select> element"), e.getMessage());
   }
 
-  @Test
-  void shouldReturnOnNoMatchedValues() {
+  @PlaywrightTest
+  void shouldReturnOnNoMatchedValues(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     List<String> result = page.selectOption("select", new String[]{});
     assertEquals(emptyList(), result);
   }
 
-  @Test
-  void shouldReturnAnArrayOfMatchedValues() {
+  @PlaywrightTest
+  void shouldReturnAnArrayOfMatchedValues(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window['makeMultiple']()");
     List<String> result = page.selectOption("select", new String[]{"blue", "black", "magenta"});
@@ -167,22 +168,22 @@ void shouldReturnAnArrayOfMatchedValues() {
     assertEquals(expected, result);
   }
 
-  @Test
-  void shouldReturnAnArrayOfOneElementWhenMultipleIsNotSet() {
+  @PlaywrightTest
+  void shouldReturnAnArrayOfOneElementWhenMultipleIsNotSet(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     List<String> result = page.selectOption("select", new String[]{"42", "blue", "black", "magenta"});
     assertEquals(1, result.size());
   }
 
-  @Test
-  void shouldReturnOnNoValues() {
+  @PlaywrightTest
+  void shouldReturnOnNoValues(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     Object result = page.selectOption("select", new String[0]);
     assertEquals(emptyList(), result);
   }
 
 //  @Test
-  void shouldNotAllowNullItems() {
+  void shouldNotAllowNullItems(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window['makeMultiple']()");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -191,8 +192,8 @@ void shouldNotAllowNullItems() {
     assertTrue(e.getMessage().contains("options.get(1): expected object, got null"));
   }
 
-  @Test
-  void shouldUnselectWithNull() {
+  @PlaywrightTest
+  void shouldUnselectWithNull(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window['makeMultiple']()");
     List<String> result = page.selectOption("select", new String[]{"blue", "black", "magenta"});
@@ -208,8 +209,8 @@ void shouldUnselectWithNull() {
     assertEquals(true, page.evalOnSelector("select", "select => Array.from(select.options).every(option => !option.selected)"));
   }
 
-  @Test
-  void shouldDeselectAllOptionsWhenPassedNoValuesForAMultipleSelect() {
+  @PlaywrightTest
+  void shouldDeselectAllOptionsWhenPassedNoValuesForAMultipleSelect(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window['makeMultiple']()");
     page.selectOption("select", new String[]{"blue", "black", "magenta"});
@@ -217,8 +218,8 @@ void shouldDeselectAllOptionsWhenPassedNoValuesForAMultipleSelect() {
     assertEquals(true, page.evalOnSelector("select", "select => Array.from(select.options).every(option => !option.selected)"));
   }
 
-  @Test
-  void shouldDeselectAllOptionsWhenPassedNoValuesForASelectWithoutMultiple() {
+  @PlaywrightTest
+  void shouldDeselectAllOptionsWhenPassedNoValuesForASelectWithoutMultiple(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.selectOption("select", new String[]{"blue", "black", "magenta"});
     page.selectOption("select", new String[0]);
@@ -230,8 +231,8 @@ void shouldThrowIfPassedWrongTypes() {
   }
 
   // @see https://github.com/GoogleChrome/puppeteer/issues/3327
-  @Test
-  void shouldWorkWhenReDefiningTopLevelEventClass() {
+  @PlaywrightTest
+  void shouldWorkWhenReDefiningTopLevelEventClass(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/select.html");
     page.evaluate("() => window.Event = null");
     page.selectOption("select", "blue");
@@ -239,8 +240,8 @@ void shouldWorkWhenReDefiningTopLevelEventClass() {
     assertEquals(asList("blue"), page.evaluate("() => window['result'].onChange"));
   }
 
-  @Test
-  void shouldWaitForOptionToBeEnabled() {
+  @PlaywrightTest
+  void shouldWaitForOptionToBeEnabled(Page page) {
     page.setContent(
       "<select disabled>\n" +
       "  <option>one</option>\n" +
@@ -264,8 +265,8 @@ void shouldWaitForOptionToBeEnabled() {
     assertThat(page.locator("select")).hasValue("two");
   }
 
-  @Test
-  void shouldWaitForSelectToBeSwapped() {
+  @PlaywrightTest
+  void shouldWaitForSelectToBeSwapped(Page page) {
     page.setContent(
       "<select disabled>\n" +
       "  <option>one</option>\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageSetContent.java b/playwright/src/test/java/com/microsoft/playwright/TestPageSetContent.java
index 8f15b6cb4..6d09990be 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageSetContent.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageSetContent.java
@@ -16,25 +16,25 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.WaitUntilState;
-import org.junit.jupiter.api.Test;
 
 import static com.microsoft.playwright.options.WaitUntilState.COMMIT;
 import static com.microsoft.playwright.options.WaitUntilState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageSetContent extends TestBase {
+public class TestPageSetContent {
   private static final String expectedOutput = "<html><head></head><body><div>hello</div></body></html>";
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     page.setContent("<div>hello</div>");
     Object result = page.content();
     assertEquals(expectedOutput, result);
   }
 
-  @Test
-  void shouldIncludeShadowRoots() {
+  @PlaywrightTest
+  void shouldIncludeShadowRoots(Page page) {
     String html = "<!DOCTYPE html><html lang=\"en\"><head></head><body><div id=\"host\"><template shadowrootmode=\"open\"><div id=\"nested\"><template shadowrootmode=\"open\"><span>nested</span></template><slot></slot></div></template><span>light</span></div><div id=\"closed\"></div></body></html>";
     // Closed shadow roots are not accessible from script and are never serialized.
     page.setContent(html.replace("<div id=\"closed\">", "<div id=\"closed\"><template shadowrootmode=\"closed\"><span>closed</span></template>"));
@@ -42,31 +42,31 @@ void shouldIncludeShadowRoots() {
     assertEquals(html, page.content(new Page.ContentOptions().setIncludeShadow(true)));
   }
 
-  @Test
-  void shouldWorkWithDomcontentloaded() {
+  @PlaywrightTest
+  void shouldWorkWithDomcontentloaded(Page page) {
     page.setContent("<div>hello</div>", new Page.SetContentOptions().setWaitUntil(DOMCONTENTLOADED));
     Object result = page.content();
     assertEquals(expectedOutput, result);
   }
 
-  @Test
-  void shouldWorkWithCommit() {
+  @PlaywrightTest
+  void shouldWorkWithCommit(Page page) {
     page.setContent("<div>hello</div>", new Page.SetContentOptions().setWaitUntil(COMMIT));
     Object result = page.content();
     assertEquals(expectedOutput, result);
   }
 
 
-  @Test
-  void shouldWorkWithDoctype() {
+  @PlaywrightTest
+  void shouldWorkWithDoctype(Page page) {
     String doctype = "<!DOCTYPE html>";
     page.setContent(doctype + "<div>hello</div>");
     Object result = page.content();
     assertEquals(doctype + expectedOutput, result);
   }
 
-  @Test
-  void shouldWorkWithHTML4Doctype() {
+  @PlaywrightTest
+  void shouldWorkWithHTML4Doctype(Page page) {
     String doctype = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" " +
       "\"http://www.w3.org/TR/html4/strict.dtd\">";
     page.setContent(doctype + "<div>hello</div>");
@@ -74,8 +74,8 @@ void shouldWorkWithHTML4Doctype() {
     assertEquals(doctype + expectedOutput, result);
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page, Server server) {
     String imgPath = "/img.png";
     // stall for image
     server.setRoute(imgPath, exchange -> {});
@@ -84,8 +84,8 @@ void shouldRespectTimeout() {
     });
   }
 
-  @Test
-  void shouldRespectDefaultNavigationTimeout() {
+  @PlaywrightTest
+  void shouldRespectDefaultNavigationTimeout(Page page, Server server) {
     page.setDefaultNavigationTimeout(100);
      String imgPath = "/img.png";
     // stall for image
@@ -96,33 +96,33 @@ void shouldRespectDefaultNavigationTimeout() {
     assertTrue(e.getMessage().contains("Timeout 100ms exceeded."), e.getMessage());
   }
 
-  @Test
-  void shouldWorkFastEnough() {
+  @PlaywrightTest
+  void shouldWorkFastEnough(Page page) {
     for (int i = 0; i < 20; ++i) {
       page.setContent("<div>yo</div>");
     }
   }
 
-  @Test
-  void shouldWorkWithTrickyContent() {
+  @PlaywrightTest
+  void shouldWorkWithTrickyContent(Page page) {
     page.setContent("<div>hello world</div>" + "\\x7F");
     assertEquals("hello world", page.evalOnSelector("div", "div => div.textContent"));
   }
 
-  @Test
-  void shouldWorkWithAccents() {
+  @PlaywrightTest
+  void shouldWorkWithAccents(Page page) {
     page.setContent("<div>aberración</div>");
     assertEquals("aberración", page.evalOnSelector("div", "div => div.textContent"));
   }
 
-  @Test
-  void shouldWorkWithEmojis() {
+  @PlaywrightTest
+  void shouldWorkWithEmojis(Page page) {
     page.setContent("<div>🐥</div>");
     assertEquals("🐥", page.evalOnSelector("div", "div => div.textContent"));
   }
 
-  @Test
-  void shouldWorkWithNewline() {
+  @PlaywrightTest
+  void shouldWorkWithNewline(Page page) {
     page.setContent("<div>\n</div>");
     assertEquals("\n", page.evalOnSelector("div", "div => div.textContent"));
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java b/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java
index 54729f29a..36d753741 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -25,9 +25,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageSetExtraHttpHeaders extends TestBase {
-  @Test
-  void shouldWork() throws ExecutionException, InterruptedException {
+public class TestPageSetExtraHttpHeaders {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) throws ExecutionException, InterruptedException {
     page.setExtraHTTPHeaders(mapOf("foo", "bar"));
     Future<Server.Request> request = server.futureRequest("/empty.html");
     page.navigate(server.EMPTY_PAGE);
@@ -35,8 +35,8 @@ void shouldWork() throws ExecutionException, InterruptedException {
     assertNull(request.get().headers.get("baz"));
   }
 
-  @Test
-  void shouldWorkWithRedirects() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithRedirects(Page page, Server server) throws ExecutionException, InterruptedException {
     server.setRedirect("/foo.html", "/empty.html");
     page.setExtraHTTPHeaders(mapOf("foo", "bar"));
     Future<Server.Request> request = server.futureRequest("/empty.html");
@@ -44,8 +44,8 @@ void shouldWorkWithRedirects() throws ExecutionException, InterruptedException {
     assertEquals(asList("bar"), request.get().headers.get("foo"));
   }
 
-  @Test
-  void shouldWorkWithExtraHeadersFromBrowserContext() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithExtraHeadersFromBrowserContext(Browser browser, Server server) throws ExecutionException, InterruptedException {
     BrowserContext context = browser.newContext();
     context.setExtraHTTPHeaders(mapOf("foo", "bar"));
     Page page = context.newPage();
@@ -55,8 +55,8 @@ void shouldWorkWithExtraHeadersFromBrowserContext() throws ExecutionException, I
     assertEquals(asList("bar"), request.get().headers.get("foo"));
   }
 
-  @Test
-  void shouldOverrideExtraHeadersFromBrowserContext() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldOverrideExtraHeadersFromBrowserContext(Browser browser, Server server) throws ExecutionException, InterruptedException {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setExtraHTTPHeaders(mapOf("fOo", "bAr", "baR", "foO")));
     Page page = context.newPage();
@@ -68,8 +68,8 @@ void shouldOverrideExtraHeadersFromBrowserContext() throws ExecutionException, I
     assertEquals(asList("foO"), request.get().headers.get("bar"));
   }
 
-  @Test
-  void shouldThrowForNonStringHeaderValues() {
+  @PlaywrightTest
+  void shouldThrowForNonStringHeaderValues(Browser browser) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       browser.newContext(new Browser.NewContextOptions().setExtraHTTPHeaders(mapOf("foo", null)));
     });
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java b/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java
index 1266d2f12..fd721a211 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageSetInputFiles.java
@@ -16,10 +16,12 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
 import com.microsoft.playwright.options.FilePayload;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.*;
@@ -38,16 +40,18 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import static com.microsoft.playwright.Utils.chromiumVersionLessThan;
 import static com.microsoft.playwright.Utils.relativePathOrSkipTest;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
 
-public class TestPageSetInputFiles extends TestBase {
+public class TestPageSetInputFiles {
   static Path FILE_TO_UPLOAD = Paths.get("src/test/resources/file-to-upload.txt");
 
-  @Test
-  void shouldUploadTheFile() {
+  @PlaywrightTest
+  void shouldUploadTheFile(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/fileupload.html");
     ElementHandle input = page.querySelector("input");
     input.setInputFiles(FILE_TO_UPLOAD);
@@ -60,8 +64,8 @@ void shouldUploadTheFile() {
       "}", input));
   }
 
-  @Test
-  void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldUploadLargeFile(Page page, Server server, @TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
     Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
     page.navigate(server.PREFIX + "/input/fileupload.html");
     Path uploadFile = tmpDir.resolve("200MB.zip");
@@ -100,8 +104,8 @@ void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionEx
     assertEquals(200 * 1024 * 1024, fields.get(0).content.length());
   }
 
-  @Test
-  void shouldUploadMultipleLargeFiles(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldUploadMultipleLargeFiles(Page page, Server server, @TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
     Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
     int filesCount = 10;
     page.navigate(server.PREFIX + "/input/fileupload-multi.html");
@@ -128,8 +132,8 @@ void shouldUploadMultipleLargeFiles(@TempDir Path tmpDir) throws IOException, Ex
     assertEquals(filesCount, filesLen);
   }
 
-  @Test
-  void shouldUploadLargeFileWithRelativePath(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldUploadLargeFileWithRelativePath(Page page, Server server, @TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
     Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
     page.navigate(server.PREFIX + "/input/fileupload.html");
     Path uploadFile = tmpDir.resolve("200MB.zip");
@@ -171,24 +175,24 @@ void shouldUploadLargeFileWithRelativePath(@TempDir Path tmpDir) throws IOExcept
     assertEquals(200 * 1024 * 1024, fields.get(0).content.length());
   }
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page) {
     page.setContent("<input type=file>");
     page.setInputFiles("input", FILE_TO_UPLOAD);
     assertEquals(1, page.evalOnSelector("input", "input => input.files.length"));
     assertEquals("file-to-upload.txt", page.evalOnSelector("input", "input => input.files[0].name"));
   }
 
-  @Test
-  void shouldSetFromMemory() {
+  @PlaywrightTest
+  void shouldSetFromMemory(Page page) {
     page.setContent("<input type=file>");
     page.setInputFiles("input", new FilePayload("test.txt","text/plain","this is a test".getBytes()));
     assertEquals(1, page.evalOnSelector("input", "input => input.files.length"));
     assertEquals("test.txt", page.evalOnSelector("input", "input => input.files[0].name"));
   }
 
-  @Test
-  void shouldEmitEventOnce() {
+  @PlaywrightTest
+  void shouldEmitEventOnce(Page page) {
     page.setContent("<input type=file>");
     FileChooser chooser = page.waitForFileChooser(() -> page.click("input"));
     assertNotNull(chooser);
@@ -198,8 +202,8 @@ void shouldEmitEventOnOff() {
     // Not applicable in Java.
   }
 
-  @Test
-  void shouldEmitEventAddListenerRemoveListener() {
+  @PlaywrightTest
+  void shouldEmitEventAddListenerRemoveListener(Page page) {
     page.setContent("<input type=file>");
     FileChooser[] chooser = { null };
     page.onFileChooser(new Consumer<FileChooser>() {
@@ -217,15 +221,15 @@ public void accept(FileChooser fileChooser) {
     assertNotNull(chooser[0]);
   }
 
-  @Test
-  void shouldWorkWhenFileInputIsAttachedToDOM() {
+  @PlaywrightTest
+  void shouldWorkWhenFileInputIsAttachedToDOM(Page page) {
     page.setContent("<input type=file>");
     FileChooser chooser = page.waitForFileChooser(() -> page.click("input"));
     assertNotNull(chooser);
   }
 
-  @Test
-  void shouldWorkWhenFileInputIsNotAttachedToDOM() {
+  @PlaywrightTest
+  void shouldWorkWhenFileInputIsNotAttachedToDOM(Page page) {
     FileChooser chooser = page.waitForFileChooser(() -> {
       page.evaluate("() => {\n" +
         "  const el = document.createElement('input');\n" +
@@ -236,8 +240,8 @@ void shouldWorkWhenFileInputIsNotAttachedToDOM() {
     assertNotNull(chooser);
   }
 
-  @Test
-  void shouldWorkWithCSP() {
+  @PlaywrightTest
+  void shouldWorkWithCSP(Page page, Server server) {
     server.setCSP("/empty.html", "default-src 'none'");
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<input type=file>");
@@ -246,16 +250,16 @@ void shouldWorkWithCSP() {
     assertEquals("file-to-upload.txt", page.evalOnSelector("input", "input => input.files[0].name"));
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFileChooser(new Page.WaitForFileChooserOptions().setTimeout(1), () -> {});
     });
     assertTrue(e.getMessage().contains("Timeout 1ms exceeded"));
   }
 
-  @Test
-  void shouldRespectDefaultTimeoutWhenThereIsNoCustomTimeout() {
+  @PlaywrightTest
+  void shouldRespectDefaultTimeoutWhenThereIsNoCustomTimeout(Page page) {
     page.setDefaultTimeout(1);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFileChooser(() -> {});
@@ -263,8 +267,8 @@ void shouldRespectDefaultTimeoutWhenThereIsNoCustomTimeout() {
     assertTrue(e.getMessage().contains("Timeout 1ms exceeded"));
   }
 
-  @Test
-  void shouldPrioritizeExactTimeoutOverDefaultTimeout() {
+  @PlaywrightTest
+  void shouldPrioritizeExactTimeoutOverDefaultTimeout(Page page) {
     page.setDefaultTimeout(0);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFileChooser(new Page.WaitForFileChooserOptions().setTimeout(1), () -> {});
@@ -272,8 +276,8 @@ void shouldPrioritizeExactTimeoutOverDefaultTimeout() {
     assertTrue(e.getMessage().contains("Timeout 1ms exceeded"));
   }
 
-  @Test
-  void shouldWorkWithNoTimeout() {
+  @PlaywrightTest
+  void shouldWorkWithNoTimeout(Page page) {
     FileChooser fileChooser = page.waitForFileChooser(new Page.WaitForFileChooserOptions().setTimeout(0), () -> {
       page.evaluate("() => setTimeout(() => {\n" +
         "  const el = document.createElement('input');\n" +
@@ -284,8 +288,8 @@ void shouldWorkWithNoTimeout() {
     assertNotNull(fileChooser);
   }
 
-  @Test
-  void shouldReturnTheSameFileChooserWhenThereAreManyWatchdogsSimultaneously() {
+  @PlaywrightTest
+  void shouldReturnTheSameFileChooserWhenThereAreManyWatchdogsSimultaneously(Page page) {
     page.setContent("<input type=file>");
     FileChooser[] fileChooser = {null};
     FileChooser fileChooser1 = page.waitForFileChooser(() -> {
@@ -296,8 +300,8 @@ void shouldReturnTheSameFileChooserWhenThereAreManyWatchdogsSimultaneously() {
     assertEquals(fileChooser[0], fileChooser1);
   }
 
-  @Test
-  void shouldAcceptSingleFile() {
+  @PlaywrightTest
+  void shouldAcceptSingleFile(Page page) {
     page.setContent("<input type=file oninput='javascript:console.timeStamp()'>");
     FileChooser fileChooser = page.waitForFileChooser(() -> page.click("input"));
     assertEquals(page, fileChooser.page());
@@ -307,8 +311,8 @@ void shouldAcceptSingleFile() {
     assertEquals("file-to-upload.txt", page.evalOnSelector("input", "input => input.files[0].name"));
   }
 
-  @Test
-  void shouldAcceptSingleFilePayload() {
+  @PlaywrightTest
+  void shouldAcceptSingleFilePayload(Page page) {
     page.setContent("<input type=file oninput='javascript:console.timeStamp()'>");
     FileChooser fileChooser = page.waitForFileChooser(() -> page.click("input"));
     assertEquals(page, fileChooser.page());
@@ -318,13 +322,13 @@ void shouldAcceptSingleFilePayload() {
     assertEquals("test.txt", page.evalOnSelector("input", "input => input.files[0].name"));
   }
 
-  //  @Test
+  //  @PlaywrightTest
   void shouldDetectMimeType() throws ExecutionException, InterruptedException {
     // TODO: Parse form fields on server
   }
 
-  @Test
-  void shouldBeAbleToReadSelectedFile() {
+  @PlaywrightTest
+  void shouldBeAbleToReadSelectedFile(Page page) {
     page.setContent("<input type=file>");
     page.onFileChooser(fileChooser -> {
       fileChooser.setFiles(FILE_TO_UPLOAD);
@@ -340,8 +344,8 @@ void shouldBeAbleToReadSelectedFile() {
     assertEquals("contents of the file", content);
   }
 
-  @Test
-  void shouldBeAbleToResetSelectedFilesWithEmptyFileList() {
+  @PlaywrightTest
+  void shouldBeAbleToResetSelectedFilesWithEmptyFileList(Page page) {
     page.setContent("<input type=file>");
     page.onFileChooser(new Consumer<FileChooser>() {
       @Override
@@ -372,8 +376,8 @@ public void accept(FileChooser fileChooser) {
     assertEquals(0, fileLength2);
   }
 
-  @Test
-  void shouldNotAcceptMultipleFilesForSingleFileInput() {
+  @PlaywrightTest
+  void shouldNotAcceptMultipleFilesForSingleFileInput(Page page) {
     page.setContent("<input type=file>");
     FileChooser fileChooser = page.waitForFileChooser(() -> page.click("input"));
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -382,8 +386,8 @@ void shouldNotAcceptMultipleFilesForSingleFileInput() {
     assertTrue(e.getMessage().contains("Non-multiple file input can only accept single file"));
   }
 
-  @Test
-  void shouldEmitInputAndChangeEvents() {
+  @PlaywrightTest
+  void shouldEmitInputAndChangeEvents(Page page) {
     List<Object> events = new ArrayList<>();
     page.exposeFunction("eventHandled", args -> events.add(args[0]));
     page.setContent("<input id=input type=file></input>\n" +
@@ -395,29 +399,29 @@ void shouldEmitInputAndChangeEvents() {
     assertEquals(asList("input", "change"), events);
   }
 
-  @Test
-  void shouldWorkForSingleFilePick() {
+  @PlaywrightTest
+  void shouldWorkForSingleFilePick(Page page) {
     page.setContent("<input type=file>");
     FileChooser fileChooser = page.waitForFileChooser(() -> page.click("input"));
     assertFalse(fileChooser.isMultiple());
   }
 
-  @Test
-  void shouldWorkForMultiple() {
+  @PlaywrightTest
+  void shouldWorkForMultiple(Page page) {
     page.setContent("<input multiple type=file>");
     FileChooser fileChooser = page.waitForFileChooser(() -> page.click("input"));
     assertTrue(fileChooser.isMultiple());
   }
 
-  @Test
-  void shouldWorkForWebkitdirectory() {
+  @PlaywrightTest
+  void shouldWorkForWebkitdirectory(Page page) {
     page.setContent("<input multiple webkitdirectory type=file>");
     FileChooser fileChooser = page.waitForFileChooser(() -> page.click("input"));
     assertTrue(fileChooser.isMultiple());
   }
 
-  @Test
-  void shouldPreserveLastModifiedTimestamp() throws IOException {
+  @PlaywrightTest
+  void shouldPreserveLastModifiedTimestamp(Page page) throws IOException {
     page.setContent("<input type=file multiple=true/>");
     Locator input = page.locator("input");
     input.setInputFiles(FILE_TO_UPLOAD);
@@ -435,8 +439,8 @@ static void writeFile(Path file, String content) throws IOException {
     }
   }
 
-  @Test
-  void shouldUploadAFolder(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldUploadAFolder(Page page, Browser browser, Server server, BrowserName browserName, @TempDir Path tmpDir) throws IOException {
     page.navigate(server.PREFIX + "/input/folderupload.html");
     Locator input = page.locator("input[name=\"file1\"]");
     Path dir = tmpDir.resolve("file-upload-test");
@@ -451,7 +455,7 @@ void shouldUploadAFolder(@TempDir Path tmpDir) throws IOException {
     List<String> relativePathsSorted = new ArrayList<>(webkitRelativePaths);
     relativePathsSorted.sort(String::compareTo);
     // https://issues.chromium.org/issues/345393164
-    if (isChromium() && !isHeaded() && chromiumVersionLessThan(browser.version(), "127.0.6533.0")) {
+    if (browserName == CHROMIUM && !Env.headed() && chromiumVersionLessThan(browser.version(), "127.0.6533.0")) {
       assertEquals(asList("file-upload-test/file1.txt", "file-upload-test/file2"), relativePathsSorted);
     } else {
       assertEquals(asList("file-upload-test/file1.txt", "file-upload-test/file2", "file-upload-test/sub-dir/really.txt"), relativePathsSorted);
@@ -470,8 +474,8 @@ void shouldUploadAFolder(@TempDir Path tmpDir) throws IOException {
     }
   }
 
-  @Test
-  void shouldUploadAFolderAndThrowForMultipleDirectories(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldUploadAFolderAndThrowForMultipleDirectories(Page page, Server server, @TempDir Path tmpDir) throws IOException {
     page.navigate(server.PREFIX + "/input/folderupload.html");
     Locator input = page.locator("input[name=\"file1\"]");
     Path dir = tmpDir.resolve("file-upload-test");
@@ -484,8 +488,8 @@ void shouldUploadAFolderAndThrowForMultipleDirectories(@TempDir Path tmpDir) thr
     assertTrue(e.getMessage().contains("Multiple directories are not supported"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowIfADirectoryAndFilesArePassed(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldThrowIfADirectoryAndFilesArePassed(Page page, Server server, @TempDir Path tmpDir) throws IOException {
     // Skipping conditions based on environment not directly translatable to Java; needs custom implementation
     page.navigate(server.PREFIX + "/input/folderupload.html");
     Locator input = page.locator("input[name=\"file1\"]");
@@ -497,8 +501,8 @@ void shouldThrowIfADirectoryAndFilesArePassed(@TempDir Path tmpDir) throws IOExc
     assertTrue(e.getMessage().contains("File paths must be all files or a single directory"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowWhenUploadingAFolderInANormalFileUploadInput(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldThrowWhenUploadingAFolderInANormalFileUploadInput(Page page, Server server, @TempDir Path tmpDir) throws IOException {
     page.navigate(server.PREFIX + "/input/fileupload.html");
     Locator input = page.locator("input[name=\"file1\"]");
     Path dir = tmpDir.resolve("file-upload-test");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageStrict.java b/playwright/src/test/java/com/microsoft/playwright/TestPageStrict.java
index 049dcd69a..7294fd779 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageStrict.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageStrict.java
@@ -16,15 +16,15 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.HashMap;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageStrict extends TestBase {
-  @Test
-  void shouldFailPageTextContentInStrictMode() {
+public class TestPageStrict {
+  @PlaywrightTest
+  void shouldFailPageTextContentInStrictMode(Page page) {
     page.setContent("<span>span1</span><div><span>target</span></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.textContent("span", new Page.TextContentOptions().setStrict(true));
@@ -32,8 +32,8 @@ void shouldFailPageTextContentInStrictMode() {
     assertTrue(e.getMessage().contains("strict mode violation"));
   }
 
-  @Test
-  void shouldFailPageGetAttributeInStrictMode() {
+  @PlaywrightTest
+  void shouldFailPageGetAttributeInStrictMode(Page page) {
     page.setContent("<span>span1</span><div><span>target</span></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.getAttribute("span", "id", new Page.GetAttributeOptions().setStrict(true));
@@ -41,8 +41,8 @@ void shouldFailPageGetAttributeInStrictMode() {
     assertTrue(e.getMessage().contains("strict mode violation"));
   }
 
-  @Test
-  void shouldFailPageFillInStrictMode() {
+  @PlaywrightTest
+  void shouldFailPageFillInStrictMode(Page page) {
     page.setContent("<input></input><div><input></input></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.fill("input", "text", new Page.FillOptions().setStrict(true));
@@ -51,8 +51,8 @@ void shouldFailPageFillInStrictMode() {
   }
 
 
-  @Test
-  void shouldFailPageInStrictMode() {
+  @PlaywrightTest
+  void shouldFailPageInStrictMode(Page page) {
     page.setContent("<span>span1</span><div><span>target</span></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.querySelector("span", new Page.QuerySelectorOptions().setStrict(true));
@@ -60,8 +60,8 @@ void shouldFailPageInStrictMode() {
     assertTrue(e.getMessage().contains("strict mode violation"));
   }
 
-  @Test
-  void shouldFailPageWaitForSelectorInStrictMode() {
+  @PlaywrightTest
+  void shouldFailPageWaitForSelectorInStrictMode(Page page) {
     page.setContent("<span>span1</span><div><span>target</span></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForSelector("span", new Page.WaitForSelectorOptions().setStrict(true));
@@ -69,8 +69,8 @@ void shouldFailPageWaitForSelectorInStrictMode() {
     assertTrue(e.getMessage().contains("strict mode violation"));
   }
 
-  @Test
-  void shouldFailPageDispatchEventInStrictMode() {
+  @PlaywrightTest
+  void shouldFailPageDispatchEventInStrictMode(Page page) {
     page.setContent("<span></span><div><span></span></div>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.dispatchEvent("span", "click", new HashMap<>(), new Page.DispatchEventOptions().setStrict(true));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java
index 1e99e16e5..1797ae336 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java
@@ -16,8 +16,9 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.WaitUntilState;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
@@ -28,13 +29,14 @@
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.Utils.expectedSSLError;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Collections.nCopies;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageWaitForNavigation extends TestBase {
+public class TestPageWaitForNavigation {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForNavigation(() -> page.evaluate(
       "url => window.location.href = url", server.PREFIX + "/grid.html"));
@@ -42,8 +44,8 @@ void shouldWork() {
     assertTrue(response.url().contains("grid.html"));
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForNavigation(
         new Page.WaitForNavigationOptions().setUrl("**/frame.html").setTimeout(5000),
@@ -56,8 +58,8 @@ void shouldRespectTimeout() {
   void shouldWorkWithBothDomcontentloadedAndLoad() {
   }
 
-  @Test
-  void shouldWorkWithCommit() {
+  @PlaywrightTest
+  void shouldWorkWithCommit(Page page, Server server) {
     server.setRoute("/script.js", exchange -> {});
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "text/html");
@@ -75,8 +77,8 @@ void shouldWorkWithCommit() {
     assertEquals("Hello", page.title());
   }
 
-  @Test
-  void shouldWorkWithClickingOnAnchorLinks() {
+  @PlaywrightTest
+  void shouldWorkWithClickingOnAnchorLinks(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a href='#foobar'>foobar</a>");
     Response response = page.waitForNavigation(() -> page.click("a"));
@@ -88,8 +90,8 @@ private boolean checkSSLErrorMessage(String exceptionMessage, List<String> possi
     return possibleErrorMessages.stream().anyMatch(exceptionMessage::contains);
   }
 
-  @Test
-  void shouldWorkWithClickingOnLinksWhichDoNotCommitNavigation() throws InterruptedException {
+  @PlaywrightTest
+  void shouldWorkWithClickingOnLinksWhichDoNotCommitNavigation(Page page, BrowserType browserType, Server server, HttpsServer httpsServer) throws InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a href='" + httpsServer.EMPTY_PAGE + "'>foobar</a>");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
@@ -100,8 +102,8 @@ void shouldWorkWithClickingOnLinksWhichDoNotCommitNavigation() throws Interrupte
     assertTrue(checkSSLErrorMessage(e.getMessage(), possibleErrorMessages), "Unexpected exception: '" + e.getMessage() + "' check message(s): " + String.join(",", possibleErrorMessages));
   }
 
-  @Test
-  void shouldWorkWithHistoryPushState() {
+  @PlaywrightTest
+  void shouldWorkWithHistoryPushState(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a onclick='javascript:pushState()'>SPA</a>\n" +
       "<script>\n" +
@@ -112,8 +114,8 @@ void shouldWorkWithHistoryPushState() {
     assertEquals(server.PREFIX + "/wow.html", page.url());
   }
 
-  @Test
-  void shouldWorkWithHistoryReplaceState() {
+  @PlaywrightTest
+  void shouldWorkWithHistoryReplaceState(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent(" <a onclick='javascript:replaceState()'>SPA</a>\n" +
       "<script>\n" +
@@ -124,8 +126,8 @@ void shouldWorkWithHistoryReplaceState() {
     assertEquals(server.PREFIX + "/replaced.html", page.url());
   }
 
-  @Test
-  void shouldWorkWithDOMHistoryBackHistoryForward() {
+  @PlaywrightTest
+  void shouldWorkWithDOMHistoryBackHistoryForward(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a id=back onclick='javascript:goBack()'>back</a>\n" +
       "<a id=forward onclick='javascript:goForward()'>forward</a>\n" +
@@ -147,8 +149,8 @@ void shouldWorkWithDOMHistoryBackHistoryForward() {
     assertEquals(server.PREFIX + "/second.html", page.url());
   }
 
-  @Test
-  void shouldWorkWhenSubframeIssuesWindowStop() {
+  @PlaywrightTest
+  void shouldWorkWhenSubframeIssuesWindowStop(Page page, Server server, BrowserName browserName) {
     server.setRoute("/frames/style.css", exchange -> {});
     boolean[] frameWindowStopCalled = {false};
     page.onFrameAttached(frame -> {
@@ -162,13 +164,13 @@ void shouldWorkWhenSubframeIssuesWindowStop() {
     try {
       page.navigate(server.PREFIX + "/frames/one-frame.html", new Page.NavigateOptions().setTimeout(2000));
     } catch (TimeoutError e) {
-      assertTrue(isWebKit()); // Chromium and Firefox issue load event in this case.
+      assertTrue(browserName == WEBKIT); // Chromium and Firefox issue load event in this case.
     }
     assertTrue(frameWindowStopCalled[0]);
   }
 
-  @Test
-  void shouldWorkWithUrlMatch() {
+  @PlaywrightTest
+  void shouldWorkWithUrlMatch(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
 
     Response response1 = page.waitForNavigation(
@@ -196,8 +198,8 @@ void shouldWorkWithUrlMatch() {
     assertEquals(server.PREFIX + "/frame.html?foo=bar", response3.url());
   }
 
-  @Test
-  void shouldWorkWithUrlMatchForSameDocumentNavigations() {
+  @PlaywrightTest
+  void shouldWorkWithUrlMatchForSameDocumentNavigations(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForNavigation(new Page.WaitForNavigationOptions().setUrl("**/third.html"), () -> {
       page.evaluate("() => {\n" +
@@ -213,8 +215,8 @@ void shouldWorkWithUrlMatchForSameDocumentNavigations() {
     assertNull(response);
   }
 
-  @Test
-  void shouldWorkForCrossProcessNavigations() {
+  @PlaywrightTest
+  void shouldWorkForCrossProcessNavigations(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     String url = server.CROSS_PROCESS_PREFIX + "/empty.html";
     Response response = page.waitForNavigation(
@@ -225,8 +227,8 @@ void shouldWorkForCrossProcessNavigations() {
     assertEquals(url, page.evaluate("document.location.href"));
   }
 
-  @Test
-  void shouldWorkOnFrame() {
+  @PlaywrightTest
+  void shouldWorkOnFrame(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     Frame frame = page.frames().get(1);
     Response response = frame.waitForNavigation(() -> frame.evaluate("url => window.location.href = url", server.PREFIX + "/grid.html"));
@@ -236,8 +238,8 @@ void shouldWorkOnFrame() {
     assertTrue(page.url().contains("/frames/one-frame.html"));
   }
 
-  @Test
-  void shouldFailWhenFrameDetaches() throws InterruptedException {
+  @PlaywrightTest
+  void shouldFailWhenFrameDetaches(Page page, Server server) throws InterruptedException {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     Frame frame = page.frames().get(1);
     server.setRoute("/empty.html", exchange -> {});
@@ -258,8 +260,8 @@ void shouldFailWhenFrameDetaches() throws InterruptedException {
     assertTrue(ex.getMessage().contains("frame was detached"), ex.getMessage());
   }
 
-  @Test
-  void shouldThrowOnInvalidUrlMatcherTypeInPage() {
+  @PlaywrightTest
+  void shouldThrowOnInvalidUrlMatcherTypeInPage(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       Page.WaitForNavigationOptions options = new Page.WaitForNavigationOptions();
       options.url = new Object();
@@ -268,8 +270,8 @@ void shouldThrowOnInvalidUrlMatcherTypeInPage() {
     assertTrue(e.getMessage().contains("Url must be String, Pattern or Predicate<String>"));
   }
 
-  @Test
-  void shouldThrowOnInvalidUrlMatcherTypeInFrame() {
+  @PlaywrightTest
+  void shouldThrowOnInvalidUrlMatcherTypeInFrame(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     Frame frame = page.frames().get(1);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForRequest.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForRequest.java
index bbe1d8e0f..b23147454 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForRequest.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForRequest.java
@@ -16,16 +16,16 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.regex.Pattern;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageWaitForRequest extends TestBase {
+public class TestPageWaitForRequest {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest(server.PREFIX + "/digits/2.png", () -> {
       page.evaluate("() => {\n" +
@@ -37,8 +37,8 @@ void shouldWork() {
     assertEquals(server.PREFIX + "/digits/2.png", request.url());
   }
 
-  @Test
-  void shouldWorkWithPredicate() {
+  @PlaywrightTest
+  void shouldWorkWithPredicate(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest(r -> r.url().equals(server.PREFIX + "/digits/2.png"), () -> {
       page.evaluate("() => {\n" +
@@ -50,16 +50,16 @@ void shouldWorkWithPredicate() {
     assertEquals(server.PREFIX + "/digits/2.png", request.url());
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForRequest(url -> false, new Page.WaitForRequestOptions().setTimeout(1), () -> {});
     });
     assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
   }
 
-  @Test
-  void shouldRespectDefaultTimeout() {
+  @PlaywrightTest
+  void shouldRespectDefaultTimeout(Page page) {
     page.setDefaultTimeout(1);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForRequest(request -> false, () -> {});
@@ -67,8 +67,8 @@ void shouldRespectDefaultTimeout() {
     assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
   }
 
-  @Test
-  void shouldWorkWithNoTimeout() {
+  @PlaywrightTest
+  void shouldWorkWithNoTimeout(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest(
       server.PREFIX + "/digits/2.png",
@@ -82,8 +82,8 @@ void shouldWorkWithNoTimeout() {
     assertEquals(server.PREFIX + "/digits/2.png", request.url());
   }
 
-  @Test
-  void shouldWorkWithUrlMatch() {
+  @PlaywrightTest
+  void shouldWorkWithUrlMatch(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Request request = page.waitForRequest(Pattern.compile(".*digits/\\d\\.png"), () -> {
       page.evaluate("() => {\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForResponse.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForResponse.java
index c470ad211..96f91cd66 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForResponse.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForResponse.java
@@ -16,13 +16,13 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageWaitForResponse extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageWaitForResponse {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForResponse(server.PREFIX + "/digits/2.png", () -> {
       page.evaluate("() => {\n" +
@@ -34,8 +34,8 @@ void shouldWork() {
     assertEquals(server.PREFIX + "/digits/2.png", response.url());
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForResponse(r -> r.url().equals(server.PREFIX + "/digits/2.png"), () -> {
       page.evaluate("() => {\n" +
@@ -47,8 +47,8 @@ void shouldRespectTimeout() {
     assertEquals(server.PREFIX + "/digits/2.png", response.url());
   }
 
-  @Test
-  void shouldWorkWithPredicate() {
+  @PlaywrightTest
+  void shouldWorkWithPredicate(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForResponse(r -> r.url().equals(server.PREFIX + "/digits/2.png"), () -> {
       page.evaluate("() => {\n" +
@@ -60,8 +60,8 @@ void shouldWorkWithPredicate() {
     assertEquals(server.PREFIX + "/digits/2.png", response.url());
   }
 
-  @Test
-  void shouldRespectDefaultTimeout() {
+  @PlaywrightTest
+  void shouldRespectDefaultTimeout(Page page) {
     page.setDefaultTimeout(1);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForResponse(response -> false, () -> {});
@@ -69,8 +69,8 @@ void shouldRespectDefaultTimeout() {
     assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
   }
 
-  @Test
-  void shouldWorkWithNoTimeout() {
+  @PlaywrightTest
+  void shouldWorkWithNoTimeout(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Response response = page.waitForResponse(
       server.PREFIX + "/digits/2.png",
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java
index 6fd1e3ece..df87e93ed 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.WaitUntilState;
-import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.util.Collections;
@@ -26,16 +26,16 @@
 import static java.util.Collections.nCopies;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPageWaitForUrl extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestPageWaitForUrl {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.evaluate("url => window.location.href = url", server.PREFIX + "/grid.html");
     page.waitForURL("**/grid.html");
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     TimeoutError e = assertThrows(TimeoutError.class, () -> {
       page.waitForURL("**/frame.html", new Page.WaitForURLOptions().setTimeout(2500));
@@ -43,15 +43,15 @@ void shouldRespectTimeout() {
     assertTrue(e.getMessage().contains("Timeout 2500ms exceeded"));
   }
 
-  @Test
-  void shouldWorkWithBothDomcontentloadedAndLoad() {
+  @PlaywrightTest
+  void shouldWorkWithBothDomcontentloadedAndLoad(Page page, Server server) {
     page.navigate(server.PREFIX + "/one-style.html");
     page.waitForURL("**/one-style.html", new Page.WaitForURLOptions().setWaitUntil(WaitUntilState.DOMCONTENTLOADED));
     page.waitForURL("**/one-style.html", new Page.WaitForURLOptions().setWaitUntil(WaitUntilState.LOAD));
   }
 
-  @Test
-  void shouldWorkWithCommit() {
+  @PlaywrightTest
+  void shouldWorkWithCommit(Page page, Server server) {
     server.setRoute("/script.js", exchange -> {});
     server.setRoute("/empty.html", exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "text/html");
@@ -68,21 +68,21 @@ void shouldWorkWithCommit() {
     assertEquals("Hello", page.title());
   }
 
-  @Test
-  void shouldWorkWithCommitAndAboutBlank() {
+  @PlaywrightTest
+  void shouldWorkWithCommitAndAboutBlank(Page page) {
     page.waitForURL("about:blank", new Page.WaitForURLOptions().setWaitUntil(WaitUntilState.COMMIT));
   }
 
-  @Test
-  void shouldWorkWithClickingOnAnchorLinks() {
+  @PlaywrightTest
+  void shouldWorkWithClickingOnAnchorLinks(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a href='#foobar'>foobar</a>");
     page.click("a");
     page.waitForURL("**/*#foobar");
   }
 
-  @Test
-  void shouldWorkWithHistoryPushState() {
+  @PlaywrightTest
+  void shouldWorkWithHistoryPushState(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a onclick='javascript:pushState()'>SPA</a>\n" +
       "<script>\n" +
@@ -93,8 +93,8 @@ void shouldWorkWithHistoryPushState() {
     assertEquals(server.PREFIX + "/wow.html", page.url());
   }
 
-  @Test
-  void shouldWorkWithHistoryReplaceState() {
+  @PlaywrightTest
+  void shouldWorkWithHistoryReplaceState(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent(" <a onclick='javascript:replaceState()'>SPA</a>\n" +
       "<script>\n" +
@@ -105,8 +105,8 @@ void shouldWorkWithHistoryReplaceState() {
     assertEquals(server.PREFIX + "/replaced.html", page.url());
   }
 
-  @Test
-  void shouldWorkWithDOMHistoryBackHistoryForward() {
+  @PlaywrightTest
+  void shouldWorkWithDOMHistoryBackHistoryForward(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a id=back onclick='javascript:goBack()'>back</a>\n" +
       "<a id=forward onclick='javascript:goForward()'>forward</a>\n" +
@@ -127,8 +127,8 @@ void shouldWorkWithDOMHistoryBackHistoryForward() {
     assertEquals(server.PREFIX + "/second.html", page.url());
   }
 
-  @Test
-  void shouldWorkOnFrame() {
+  @PlaywrightTest
+  void shouldWorkOnFrame(Page page, Server server) {
     page.navigate(server.PREFIX + "/frames/one-frame.html");
     Frame frame = page.frames().get(1);
     frame.evaluate("url => window.location.href = url", server.PREFIX + "/grid.html");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPdf.java b/playwright/src/test/java/com/microsoft/playwright/TestPdf.java
index 8b22eb23f..af5cacbee 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPdf.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPdf.java
@@ -16,30 +16,31 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.condition.EnabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPdf extends TestBase {
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="skip")
-  void shouldBeAbleToSaveFile(@TempDir Path tempDir) throws IOException {
+public class TestPdf {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = CHROMIUM, reason = "skip")
+  void shouldBeAbleToSaveFile(Page page, @TempDir Path tempDir) throws IOException {
     Path path = tempDir.resolve("output.pdf");
     page.pdf(new Page.PdfOptions().setPath(path));
     long size = Files.size(path);
     assertTrue(size > 0);
   }
 
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="skip")
-  void shouldSupportFractionalScaleValue(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = CHROMIUM, reason = "skip")
+  void shouldSupportFractionalScaleValue(Page page, @TempDir Path tempDir) throws IOException {
     Path path = tempDir.resolve("output.pdf");
     page.pdf(new Page.PdfOptions().setPath(path).setScale(0.5));
     long size = Files.size(path);
@@ -47,9 +48,9 @@ void shouldSupportFractionalScaleValue(@TempDir Path tempDir) throws IOException
   }
 
 
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Printing to pdf is currently only supported in headless chromium.")
-  void shouldBeAbleToGenerateOutline(@TempDir Path tempDir) throws IOException {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = CHROMIUM, reason = "Printing to pdf is currently only supported in headless chromium.")
+  void shouldBeAbleToGenerateOutline(Page page, Server server, @TempDir Path tempDir) throws IOException {
     page.navigate(server.PREFIX + "/headings.html");
     Path outputFileNoOutline = tempDir.resolve("outputNoOutline.pdf");
     Path outputFileOutline = tempDir.resolve("outputOutline.pdf");
@@ -61,9 +62,9 @@ void shouldBeAbleToGenerateOutline(@TempDir Path tempDir) throws IOException {
   }
 
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="skip")
-  void correctExceptionWithPersistentContext(@TempDir Path tempDir) {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, reason = "skip")
+  void correctExceptionWithPersistentContext(BrowserType browserType, @TempDir Path tempDir) {
     Path profile = tempDir.resolve("profile");
     try (BrowserContext context = browserType.launchPersistentContext(profile)) {
       Page page = context.newPage();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCreate.java b/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCreate.java
index 0085fa860..1e80a0c98 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCreate.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPlaywrightCreate.java
@@ -16,8 +16,9 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.impl.PlaywrightImpl;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -26,19 +27,18 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import static com.microsoft.playwright.Utils.getBrowserTypeFromEnv;
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestPlaywrightCreate {
-  @Test
-  void shouldSupportEnvSkipBrowserDownload(@TempDir Path browsersDir) throws IOException, NoSuchFieldException, IllegalAccessException {
+  @PlaywrightTest
+  void shouldSupportEnvSkipBrowserDownload(BrowserName browserName, @TempDir Path browsersDir) throws IOException, NoSuchFieldException, IllegalAccessException {
     Map<String, String> env = mapOf("PLAYWRIGHT_BROWSERS_PATH", browsersDir.toString(),
       "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD", "1");
     Playwright.CreateOptions options = new Playwright.CreateOptions().setEnv(env);
 
     try (Playwright playwright = PlaywrightImpl.createImpl(options, true)) {
-      PlaywrightException e = assertThrows(PlaywrightException.class, () -> getBrowserTypeFromEnv(playwright).launch());
+      PlaywrightException e = assertThrows(PlaywrightException.class, () -> browserName.browserType(playwright).launch());
       assertTrue(e.getMessage().contains("Looks like Playwright Test or Playwright was just installed or updated") ||
         e.getMessage().contains("Looks like Playwright was just installed or updated."), e.getMessage());
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPopup.java b/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
index 5e0f36715..1ab6d9838 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPopup.java
@@ -16,7 +16,8 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Assumptions;
 
 import java.util.ArrayList;
@@ -25,14 +26,15 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.options.LoadState.DOMCONTENTLOADED;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestPopup extends TestBase {
+public class TestPopup {
 
-  @Test
-  void shouldInheritUserAgentFromBrowserContext() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldInheritUserAgentFromBrowserContext(Browser browser, Server server) throws ExecutionException, InterruptedException {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setUserAgent("hey"));
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -47,8 +49,8 @@ void shouldInheritUserAgentFromBrowserContext() throws ExecutionException, Inter
     assertEquals(Arrays.asList("hey"), request.headers.get("user-agent"));
   }
 
-  @Test
-  void shouldRespectRoutesFromBrowserContext() {
+  @PlaywrightTest
+  void shouldRespectRoutesFromBrowserContext(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -64,8 +66,8 @@ void shouldRespectRoutesFromBrowserContext() {
     assertTrue(intercepted[0]);
   }
 
-  @Test
-  void shouldInheritExtraHeadersFromBrowserContext() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldInheritExtraHeadersFromBrowserContext(Browser browser, Server server) throws ExecutionException, InterruptedException {
     @SuppressWarnings("unchecked")
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setExtraHTTPHeaders(mapOf("foo", "bar")));
@@ -78,8 +80,8 @@ void shouldInheritExtraHeadersFromBrowserContext() throws ExecutionException, In
     assertEquals(Arrays.asList("bar"), request.headers.get("foo"));
   }
 
-  @Test
-  void shouldInheritOfflineFromBrowserContext() {
+  @PlaywrightTest
+  void shouldInheritOfflineFromBrowserContext(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -92,8 +94,8 @@ void shouldInheritOfflineFromBrowserContext() {
     assertFalse(online);
   }
 
-  @Test
-  void shouldInheritHttpCredentialsFromBrowserContext() {
+  @PlaywrightTest
+  void shouldInheritHttpCredentialsFromBrowserContext(Browser browser, Server server) {
     server.setAuth("/title.html", "user", "pass");
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setHttpCredentials("user", "pass"));
@@ -106,10 +108,10 @@ void shouldInheritHttpCredentialsFromBrowserContext() {
     context.close();
   }
 
-  @Test
-  void shouldInheritTouchSupportFromBrowserContext() {
+  @PlaywrightTest
+  void shouldInheritTouchSupportFromBrowserContext(Browser browser, Server server, BrowserName browserName) {
     // https://bugzilla.mozilla.org/show_bug.cgi?id=2014330
-    Assumptions.assumeFalse(isFirefox() && Integer.parseInt(browser.version().split("\\.")[0]) >= 148);
+    Assumptions.assumeFalse(browserName == FIREFOX && Integer.parseInt(browser.version().split("\\.")[0]) >= 148);
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(400, 500)
       .setHasTouch(true));
@@ -123,8 +125,8 @@ void shouldInheritTouchSupportFromBrowserContext() {
     assertEquals(true, hasTouch);
   }
 
-  @Test
-  void shouldInheritViewportSizeFromBrowserContext() {
+  @PlaywrightTest
+  void shouldInheritViewportSizeFromBrowserContext(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(400, 500));
     Page page = context.newPage();
@@ -137,8 +139,8 @@ void shouldInheritViewportSizeFromBrowserContext() {
     assertEquals(mapOf("width", 400, "height", 500), size);
   }
 
-  @Test
-  void shouldUseViewportSizeFromWindowFeatures() {
+  @PlaywrightTest
+  void shouldUseViewportSizeFromWindowFeatures(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setViewportSize(700, 700));
     Page page = context.newPage();
@@ -166,8 +168,8 @@ void shouldUseViewportSizeFromWindowFeatures() {
     assertEquals(mapOf("width", 500, "height", 400), resized);
   }
 
-  @Test
-  void shouldRespectRoutesFromBrowserContextWithWindowOpen() {
+  @PlaywrightTest
+  void shouldRespectRoutesFromBrowserContextWithWindowOpen(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -183,8 +185,8 @@ void shouldRespectRoutesFromBrowserContextWithWindowOpen() {
     context.close();
   }
 
-  @Test
-  void BrowserContextAddInitScriptShouldApplyToAnInProcessPopup() {
+  @PlaywrightTest
+  void BrowserContextAddInitScriptShouldApplyToAnInProcessPopup(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     context.addInitScript("window['injected'] = 123");
     Page page = context.newPage();
@@ -197,8 +199,8 @@ void BrowserContextAddInitScriptShouldApplyToAnInProcessPopup() {
     assertEquals(123, injected);
   }
 
-  @Test
-  void BrowserContextAddInitScriptShouldApplyToACrossProcessPopup() {
+  @PlaywrightTest
+  void BrowserContextAddInitScriptShouldApplyToACrossProcessPopup(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     context.addInitScript("(() => window['injected'] = 123)()");
     Page page = context.newPage();
@@ -214,8 +216,8 @@ void BrowserContextAddInitScriptShouldApplyToACrossProcessPopup() {
     context.close();
   }
 
-  @Test
-  void shouldExposeFunctionFromBrowserContext() {
+  @PlaywrightTest
+  void shouldExposeFunctionFromBrowserContext(Browser browser, Server server) {
     BrowserContext context = browser.newContext();
     List<String> messages = new ArrayList<>();
     context.exposeFunction("add", args -> {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestQuerySelector.java b/playwright/src/test/java/com/microsoft/playwright/TestQuerySelector.java
index ec2d1ddfe..031eab3b3 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestQuerySelector.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestQuerySelector.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,78 +25,78 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestQuerySelector extends TestBase {
+public class TestQuerySelector {
 
-  @Test
-  void shouldThrowForNonStringSelector() {
+  @PlaywrightTest
+  void shouldThrowForNonStringSelector(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.querySelector(null));
     assertTrue(e.getMessage().contains("selector: expected string, got undefined"));
   }
 
-  @Test
-  void shouldQueryExistingElementWithCssSelector() {
+  @PlaywrightTest
+  void shouldQueryExistingElementWithCssSelector(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("css=section");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldQueryExistingElementWithTextSelector() {
+  @PlaywrightTest
+  void shouldQueryExistingElementWithTextSelector(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("text='test'");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldQueryExistingElementWithXpathSelector() {
+  @PlaywrightTest
+  void shouldQueryExistingElementWithXpathSelector(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("xpath=/html/body/section");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldReturnNullForNonExistingElement() {
+  @PlaywrightTest
+  void shouldReturnNullForNonExistingElement(Page page) {
     ElementHandle element = page.querySelector("non-existing-element");
     assertNull(element);
   }
 
-  @Test
-  void shouldAutoDetectXpathSelector() {
+  @PlaywrightTest
+  void shouldAutoDetectXpathSelector(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("//html/body/section");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldAutoDetectXpathSelectorWithStartingParenthesis() {
+  @PlaywrightTest
+  void shouldAutoDetectXpathSelectorWithStartingParenthesis(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("(//section)[1]");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldAutoDetectTextSelector() {
+  @PlaywrightTest
+  void shouldAutoDetectTextSelector(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("'test'");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldAutoDetectCssSelector() {
+  @PlaywrightTest
+  void shouldAutoDetectCssSelector(Page page) {
     page.setContent("<section>test</section>");
     ElementHandle element = page.querySelector("section");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldSupportSyntax() {
+  @PlaywrightTest
+  void shouldSupportSyntax(Page page) {
     page.setContent("<section><div>test</div></section>");
     ElementHandle element = page.querySelector("css=section >> css=div");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldQueryExistingElements() {
+  @PlaywrightTest
+  void shouldQueryExistingElements(Page page) {
     page.setContent("<div>A</div><br/><div>B</div>");
     List<ElementHandle> elements = page.querySelectorAll("div");
     assertEquals(2, elements.size());
@@ -107,36 +107,36 @@ void shouldQueryExistingElements() {
     assertEquals(Arrays.asList("A", "B"), results);
   }
 
-  @Test
-  void shouldReturnEmptyArrayIfNothingIsFound() {
+  @PlaywrightTest
+  void shouldReturnEmptyArrayIfNothingIsFound(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     List<ElementHandle> elements = page.querySelectorAll("div");
     assertEquals(0, elements.size());
   }
 
-  @Test
-  void xpathShouldQueryExistingElement() {
+  @PlaywrightTest
+  void xpathShouldQueryExistingElement(Page page) {
     page.setContent("<section>test</section>");
     List<ElementHandle> elements = page.querySelectorAll("xpath=/html/body/section");
     assertNotNull(elements.get(0));
     assertEquals(1, elements.size());
   }
 
-  @Test
-  void xpathShouldReturnEmptyArrayForNonExistingElement() {
+  @PlaywrightTest
+  void xpathShouldReturnEmptyArrayForNonExistingElement(Page page) {
     List<ElementHandle> elements = page.querySelectorAll("//html/body/non-existing-element");
     assertEquals(Collections.emptyList(), elements);
   }
 
-  @Test
-  void xpathShouldReturnMultipleElements() {
+  @PlaywrightTest
+  void xpathShouldReturnMultipleElements(Page page) {
     page.setContent("<div></div><div></div>");
     List<ElementHandle> elements = page.querySelectorAll("xpath=/html/body/div");
     assertEquals(2, elements.size());
   }
 
-  @Test
-  void querySelectorAllShouldWorkWithBogusArrayFrom() throws InterruptedException {
+  @PlaywrightTest
+  void querySelectorAllShouldWorkWithBogusArrayFrom(Page page) throws InterruptedException {
     page.setContent("<div>hello</div><div></div>");
     JSHandle div1 = page.evaluateHandle("() => {\n" +
       "  Array.from = () => [];\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestRequestContinue.java b/playwright/src/test/java/com/microsoft/playwright/TestRequestContinue.java
index 44c85a3b3..188208ccb 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestRequestContinue.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestRequestContinue.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -28,16 +28,16 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestRequestContinue extends TestBase {
+public class TestRequestContinue {
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.route("**/*", route -> route.resume());
     page.navigate(server.EMPTY_PAGE);
   }
 
-  @Test
-  void shouldAmendHTTPHeaders() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendHTTPHeaders(Page page, Server server) throws ExecutionException, InterruptedException {
     page.route("**/*", route -> {
       Map<String, String> headers = new HashMap<>(route.request().headers());
       headers.put("FOO", "bar");
@@ -49,8 +49,8 @@ void shouldAmendHTTPHeaders() throws ExecutionException, InterruptedException {
     assertEquals(Arrays.asList("bar"), request.get().headers.get("foo"));
   }
 
-  @Test
-  void shouldAmendMethod() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendMethod(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> sRequest = server.futureRequest("/sleep.zzz");
     page.navigate(server.EMPTY_PAGE);
     page.route("**/*", route -> route.resume(new Route.ResumeOptions().setMethod("POST")));
@@ -60,8 +60,8 @@ void shouldAmendMethod() throws ExecutionException, InterruptedException {
     assertEquals("POST", sRequest.get().method);
   }
 
-  @Test
-  void shouldOverrideRequestUrl() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldOverrideRequestUrl(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> serverRequest = server.futureRequest("/global-var.html");
     page.route("**/foo", route -> {
       route.resume(new Route.ResumeOptions().setUrl(server.PREFIX + "/global-var.html"));
@@ -73,9 +73,9 @@ void shouldOverrideRequestUrl() throws ExecutionException, InterruptedException
     assertEquals("GET", serverRequest.get().method);
   }
 
-  @Test
+  @PlaywrightTest
   @Disabled("resume() method is now asynchronous")
-  void shouldNotAllowChangingProtocolWhenOverridingUrl() {
+  void shouldNotAllowChangingProtocolWhenOverridingUrl(Page page, Server server) {
     page.route("**/*", route -> {
       PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
         route.resume(new Route.ResumeOptions().setUrl("file:///tmp/foo"));
@@ -86,8 +86,8 @@ void shouldNotAllowChangingProtocolWhenOverridingUrl() {
     page.navigate(server.EMPTY_PAGE);
   }
 
-  @Test
-  void shouldOverrideMethodAlongWithUrl() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldOverrideMethodAlongWithUrl(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
     page.route("**/foo", route -> {
       route.resume(new Route.ResumeOptions().setUrl(server.EMPTY_PAGE).setMethod("POST"));
@@ -96,16 +96,16 @@ void shouldOverrideMethodAlongWithUrl() throws ExecutionException, InterruptedEx
     assertEquals("POST", serverRequest.get().method);
   }
 
-  @Test
-  void shouldAmendMethodOnMainRequest() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendMethodOnMainRequest(Page page, Server server) throws ExecutionException, InterruptedException {
     Future<Server.Request> request = server.futureRequest("/empty.html");
     page.route("**/*", route -> route.resume(new Route.ResumeOptions().setMethod("POST")));
     page.navigate(server.EMPTY_PAGE);
     assertEquals("POST", request.get().method);
   }
 
-  @Test
-  void shouldAmendPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendPostData(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/*", route -> {
       route.resume(new Route.ResumeOptions().setPostData("doggo"));
@@ -115,8 +115,8 @@ void shouldAmendPostData() throws ExecutionException, InterruptedException {
     assertEquals("doggo", new String(serverRequest.get().postBody, UTF_8));
   }
 
-  @Test
-  void shouldAmendUtf8PostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendUtf8PostData(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/*", route -> {
       route.resume(new Route.ResumeOptions().setPostData("пушкин"));
@@ -127,8 +127,8 @@ void shouldAmendUtf8PostData() throws ExecutionException, InterruptedException {
     assertEquals("пушкин", new String(serverRequest.get().postBody, UTF_8));
   }
 
-  @Test
-  void shouldAmendLongerPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendLongerPostData(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     page.route("**/*", route -> {
       route.resume(new Route.ResumeOptions().setPostData("doggo-is-longer-than-birdy"));
@@ -139,8 +139,8 @@ void shouldAmendLongerPostData() throws ExecutionException, InterruptedException
     assertEquals("doggo-is-longer-than-birdy", new String(serverRequest.get().postBody, UTF_8));
   }
 
-  @Test
-  void shouldAmendBinaryPostData() throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  void shouldAmendBinaryPostData(Page page, Server server) throws ExecutionException, InterruptedException {
     page.navigate(server.EMPTY_PAGE);
     byte[] arr = new byte[256];
     for (int i = 0; i < arr.length; i++) {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestRequestFulfill.java b/playwright/src/test/java/com/microsoft/playwright/TestRequestFulfill.java
index 048cd412c..8ec358871 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestRequestFulfill.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestRequestFulfill.java
@@ -16,19 +16,20 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestRequestFulfill extends TestBase {
-  @Test
-  void shouldWork() {
+public class TestRequestFulfill {
+  @PlaywrightTest
+  void shouldWork(Page page, Server server) {
     page.route("**/*", route -> {
       route.fulfill(new Route.FulfillOptions()
         .setStatus(201)
@@ -42,8 +43,8 @@ void shouldWork() {
     assertEquals("Yo, page!", page.evaluate("() => document.body.textContent"));
   }
 
-  @Test
-  void shouldWorkWithStatusCode422() {
+  @PlaywrightTest
+  void shouldWorkWithStatusCode422(Page page, Server server) {
     page.route("**/*", route -> {
       route.fulfill(new Route.FulfillOptions()
         .setStatus(422)
@@ -55,13 +56,9 @@ void shouldWorkWithStatusCode422() {
     assertEquals("Yo, page!", page.evaluate("document.body.textContent"));
   }
 
-  static boolean isFirefoxHeaded() {
-    return isFirefox() && isHeaded();
-  }
-
-  @Test
-  @DisabledIf(value="isFirefoxHeaded", disabledReason="skip")
-  void shouldAllowMockingBinaryResponses() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, headed = true, reason = "skip")
+  void shouldAllowMockingBinaryResponses(Page page, Server server) {
     page.route("**/*", route -> {
       byte[] imageBuffer;
       try {
@@ -84,9 +81,9 @@ void shouldAllowMockingBinaryResponses() {
 //    expect(img.screenshot()).toMatchSnapshot("mock-binary-response.png");
   }
 
-  @Test
-  @DisabledIf(value="isFirefoxHeaded", disabledReason="skip")
-  void shouldAllowMockingSvgWithCharset() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, headed = true, reason = "skip")
+  void shouldAllowMockingSvgWithCharset(Page page, Server server) {
     // Firefox headed produces a different image.
     page.route("**/*", route -> {
       route.fulfill(new Route.FulfillOptions()
@@ -104,8 +101,8 @@ void shouldAllowMockingSvgWithCharset() {
   }
 
 
-  @Test
-  void fulfillShouldThrowIfHandledTwice() {
+  @PlaywrightTest
+  void fulfillShouldThrowIfHandledTwice(Page page, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.route("**/*", route -> {
         route.fulfill();
@@ -116,8 +113,8 @@ void fulfillShouldThrowIfHandledTwice() {
     assertTrue(e.getMessage().contains("Route is already handled!"), e.getMessage());
   }
 
-  @Test
-  void abortShouldThrowIfHandledTwice() {
+  @PlaywrightTest
+  void abortShouldThrowIfHandledTwice(Page page, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.route("**/*", route -> {
         route.abort();
@@ -128,8 +125,8 @@ void abortShouldThrowIfHandledTwice() {
     assertTrue(e.getMessage().contains("Route is already handled!"), e.getMessage());
   }
 
-  @Test
-  void resumeShouldThrowIfHandledTwice() {
+  @PlaywrightTest
+  void resumeShouldThrowIfHandledTwice(Page page, Server server) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.route("**/*", route -> {
         route.resume();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestRequestGC.java b/playwright/src/test/java/com/microsoft/playwright/TestRequestGC.java
index 9e31d14de..a49a00e36 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestRequestGC.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestRequestGC.java
@@ -1,19 +1,15 @@
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static com.microsoft.playwright.Utils.mapOf;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestRequestGC {
 
-  @Test
+  @PlaywrightTest
   void shouldWork(Page page) {
       page.evaluate("() => {\n" +
         "    globalThis.objectToDestroy = { hello: 'world' };\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java b/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java
index 9f3ff45b9..73a981e51 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestRouteWebSocket.java
@@ -1,10 +1,12 @@
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.java_websocket.WebSocket;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.IOException;
@@ -19,25 +21,10 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestRouteWebSocket {
-  private WebSocketServerImpl webSocketServer;
-
-  @BeforeAll
-  void startWebSockerServer() throws InterruptedException {
-    webSocketServer = WebSocketServerImpl.create();
-  }
-
-  @AfterAll
-  void stopWebSockerServer() throws IOException, InterruptedException {
-    webSocketServer.stop();
-  }
-
-  @AfterEach
-  void resetWebSocketServer() {
-    webSocketServer.reset();
+  @Fixture
+  WebSocketServerImpl webSocketServer() throws InterruptedException {
+    return WebSocketServerImpl.create();
   }
 
   private void setupWS(Page target, Server server, int port, String binaryType) {
@@ -90,96 +77,9 @@ private void setupRoute(Page page, String mock) {
     }
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
-  public void shouldWorkWithTextMessage(String mock, Page page, Server server) throws Exception {
-    setupRoute(page, mock);
-    Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
-    setupWS(page, server, webSocketServer.getPort(), "blob");
-
-    page.waitForCondition(() -> {
-      Boolean result = (Boolean) page.evaluate("() => window.log.length >= 1");
-      return result;
-    });
-    assertEquals(asList("open"), page.evaluate("window.log"));
-
-    org.java_websocket.WebSocket ws = wsPromise.get();
-    ws.send("hello");
-    page.waitForCondition(() -> {
-      Boolean result = (Boolean) page.evaluate("() => window.log.length >= 2");
-      return result;
-    });
-
-    assertEquals(
-      asList("open", "message: data=hello origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId="),
-      page.evaluate("window.log"));
-
-    assertEquals(1, page.evaluate("window.ws.readyState"));
-
-    Future<String> messagePromise = webSocketServer.waitForMessage();
-    page.evaluate("() => window.ws.send('hi')");
-    assertEquals("hi", messagePromise.get());
-    ws.close(1008, "oops");
-    page.waitForCondition(() -> {
-      Integer result = (Integer) page.evaluate("window.ws.readyState");
-      return result == 3;
-    });
-
-    assertEquals(
-      asList("open", "message: data=hello origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId=",
-          "close code=1008 reason=oops"),
-      page.evaluate("window.log"));
-  }
-
-
-  @ParameterizedTest
-  @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
-  public void shouldWorkWithBinaryTypeBlob(String mock, Page page, Server server) throws Exception {
-    setupRoute(page, mock);
-    Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
-    setupWS(page, server, webSocketServer.getPort(), "blob");
-    org.java_websocket.WebSocket ws = wsPromise.get();
-    ws.send("hi".getBytes(StandardCharsets.UTF_8));
-    page.waitForCondition(() -> {
-      Boolean result = (Boolean) page.evaluate("() => window.log.length >= 2");
-      return result;
-    });
-
-    assertEquals(
-        asList("open", "message: data=blob:hi origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId="),
-        page.evaluate("window.log"));
-    Future<String> messagePromise = webSocketServer.waitForMessage();
-    page.evaluate("() => window.ws.send(new Blob([new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)])]))");
-    // Dispatch messages until web socket route is received.
-    page.waitForCondition(() -> messagePromise.isDone());
-    assertEquals("hi", messagePromise.get());
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
-  public void shouldWorkWithBinaryTypeArrayBuffer(String mock, Page page, Server server) throws Exception {
-    setupRoute(page, mock);
-    Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
-    setupWS(page, server, webSocketServer.getPort(), "arraybuffer");
-    org.java_websocket.WebSocket ws = wsPromise.get();
-    ws.send("hi".getBytes(StandardCharsets.UTF_8));
-    page.waitForCondition(() -> {
-      Boolean result = (Boolean) page.evaluate("() => window.log.length >= 2");
-      return result;
-    });
-
-    assertEquals(
-      asList("open", "message: data=arraybuffer:hi origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId="),
-      page.evaluate("window.log"));
-    Future<String> messagePromise = webSocketServer.waitForMessage();
-    page.evaluate("() => window.ws.send(new Blob([new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)])]))");
-    // Dispatch messages until web socket route is received.
-    page.waitForCondition(() -> messagePromise.isDone());
-    assertEquals("hi", messagePromise.get());
-  }
 
-  @Test
-  public void shouldWorkWithServer(Page page, Server server) throws ExecutionException, InterruptedException {
+  @PlaywrightTest
+  public void shouldWorkWithServer(Page page, Server server, WebSocketServerImpl webSocketServer) throws ExecutionException, InterruptedException {
     WebSocketRoute[] wsRoute = new WebSocketRoute[]{null};
     page.routeWebSocket(Pattern.compile("/.*/"), ws -> {
       WebSocketRoute serverRoute = ws.connectToServer();
@@ -276,8 +176,8 @@ public void shouldWorkWithServer(Page page, Server server) throws ExecutionExcep
       webSocketServer.logCopy());
   }
 
-  @Test
-  public void shouldWorkWithoutServer(Page page, Server server) {
+  @PlaywrightTest
+  public void shouldWorkWithoutServer(Page page, Server server, WebSocketServerImpl webSocketServer) {
     WebSocketRoute[] wsRoute = new WebSocketRoute[]{ null };
     page.routeWebSocket(Pattern.compile("/.*/"), ws -> {
       ws.onMessage(frame -> {
@@ -320,8 +220,8 @@ public void shouldWorkWithoutServer(Page page, Server server) {
       page.evaluate("window.log"));
   }
 
-  @Test
-  public void shouldWorkWithBaseURL(Browser browser, Server server) throws Exception {
+  @PlaywrightTest
+  public void shouldWorkWithBaseURL(Browser browser, Server server, WebSocketServerImpl webSocketServer) throws Exception {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setBaseURL("http://localhost:" + webSocketServer.getPort()));
     Page newPage = context.newPage();
 
@@ -352,8 +252,8 @@ public void shouldWorkWithBaseURL(Browser browser, Server server) throws Excepti
       newPage.evaluate("window.log"));
   }
 
-  @Test
-  public void shouldWorkWithNoTrailingSlash(Page page) throws Exception {
+  @PlaywrightTest
+  public void shouldWorkWithNoTrailingSlash(Page page, WebSocketServerImpl webSocketServer) throws Exception {
     List<String> log = new ArrayList<>();
 
     // No trailing slash in the route pattern
@@ -392,8 +292,8 @@ public void shouldWorkWithNoTrailingSlash(Page page) throws Exception {
     assertEquals(asList("response"), page.evaluate("window.log"));
   }
 
-  @Test
-  public void shouldExposeProtocolsToTheRouteHandler(Page page, Server server) {
+  @PlaywrightTest
+  public void shouldExposeProtocolsToTheRouteHandler(Page page, Server server, WebSocketServerImpl webSocketServer) {
     List<com.microsoft.playwright.WebSocketRoute> routes = new ArrayList<>();
     page.routeWebSocket(Pattern.compile(".*"), ws -> routes.add(ws));
 
@@ -416,4 +316,96 @@ public void shouldExposeProtocolsToTheRouteHandler(Page page, Server server) {
     assertEquals(asList("chat.v1"), byUrl.get("/ws-string").protocols());
     assertEquals(asList("chat.v2", "chat.v1"), byUrl.get("/ws-array").protocols());
   }
+
+  @Nested
+  @ParameterizedClass
+  @ValueSource(strings = {"no-mock", "no-match", "pass-through"})
+  class WithMock {
+    @Parameter
+    String mock;
+
+    @PlaywrightTest
+    public void shouldWorkWithTextMessage(Page page, Server server, WebSocketServerImpl webSocketServer) throws Exception {
+      setupRoute(page, mock);
+      Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
+      setupWS(page, server, webSocketServer.getPort(), "blob");
+
+      page.waitForCondition(() -> {
+        Boolean result = (Boolean) page.evaluate("() => window.log.length >= 1");
+        return result;
+      });
+      assertEquals(asList("open"), page.evaluate("window.log"));
+
+      org.java_websocket.WebSocket ws = wsPromise.get();
+      ws.send("hello");
+      page.waitForCondition(() -> {
+        Boolean result = (Boolean) page.evaluate("() => window.log.length >= 2");
+        return result;
+      });
+
+      assertEquals(
+        asList("open", "message: data=hello origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId="),
+        page.evaluate("window.log"));
+
+      assertEquals(1, page.evaluate("window.ws.readyState"));
+
+      Future<String> messagePromise = webSocketServer.waitForMessage();
+      page.evaluate("() => window.ws.send('hi')");
+      assertEquals("hi", messagePromise.get());
+      ws.close(1008, "oops");
+      page.waitForCondition(() -> {
+        Integer result = (Integer) page.evaluate("window.ws.readyState");
+        return result == 3;
+      });
+
+      assertEquals(
+        asList("open", "message: data=hello origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId=",
+            "close code=1008 reason=oops"),
+        page.evaluate("window.log"));
+    }
+
+    @PlaywrightTest
+    public void shouldWorkWithBinaryTypeBlob(Page page, Server server, WebSocketServerImpl webSocketServer) throws Exception {
+      setupRoute(page, mock);
+      Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
+      setupWS(page, server, webSocketServer.getPort(), "blob");
+      org.java_websocket.WebSocket ws = wsPromise.get();
+      ws.send("hi".getBytes(StandardCharsets.UTF_8));
+      page.waitForCondition(() -> {
+        Boolean result = (Boolean) page.evaluate("() => window.log.length >= 2");
+        return result;
+      });
+
+      assertEquals(
+          asList("open", "message: data=blob:hi origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId="),
+          page.evaluate("window.log"));
+      Future<String> messagePromise = webSocketServer.waitForMessage();
+      page.evaluate("() => window.ws.send(new Blob([new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)])]))");
+      // Dispatch messages until web socket route is received.
+      page.waitForCondition(() -> messagePromise.isDone());
+      assertEquals("hi", messagePromise.get());
+    }
+
+    @PlaywrightTest
+    public void shouldWorkWithBinaryTypeArrayBuffer(Page page, Server server, WebSocketServerImpl webSocketServer) throws Exception {
+      setupRoute(page, mock);
+      Future<WebSocket> wsPromise = webSocketServer.waitForWebSocket();
+      setupWS(page, server, webSocketServer.getPort(), "arraybuffer");
+      org.java_websocket.WebSocket ws = wsPromise.get();
+      ws.send("hi".getBytes(StandardCharsets.UTF_8));
+      page.waitForCondition(() -> {
+        Boolean result = (Boolean) page.evaluate("() => window.log.length >= 2");
+        return result;
+      });
+
+      assertEquals(
+        asList("open", "message: data=arraybuffer:hi origin=ws://localhost:" + webSocketServer.getPort() + " lastEventId="),
+        page.evaluate("window.log"));
+      Future<String> messagePromise = webSocketServer.waitForMessage();
+      page.evaluate("() => window.ws.send(new Blob([new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)])]))");
+      // Dispatch messages until web socket route is received.
+      page.waitForCondition(() -> messagePromise.isDone());
+      assertEquals("hi", messagePromise.get());
+    }
+  }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java b/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java
index 4b4831813..8aebd900f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestScreencast.java
@@ -16,12 +16,11 @@
 
 package com.microsoft.playwright;
 
-import com.microsoft.playwright.junit.FixtureTest;
-import com.microsoft.playwright.junit.UsePlaywright;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AnnotatePosition;
-import com.microsoft.playwright.options.ScreencastCursor;
 import com.microsoft.playwright.options.ScreencastActionStyle;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.options.ScreencastCursor;
 import org.junit.jupiter.api.io.TempDir;
 
 import javax.imageio.ImageIO;
@@ -34,11 +33,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.TestOptionsFactories.createLaunchOptions;
 import static org.junit.jupiter.api.Assertions.*;
 
-@FixtureTest
-@UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestScreencast {
   private static Browser.NewContextOptions recordVideoOptions(Path videosDir) {
     return new Browser.NewContextOptions()
@@ -47,7 +43,7 @@ private static Browser.NewContextOptions recordVideoOptions(Path videosDir) {
       .setViewportSize(320, 240);
   }
 
-  @Test
+  @PlaywrightTest
   void shouldExposeVideoPath(Browser browser, @TempDir Path videosDir) {
     Path path;
     try (BrowserContext context = browser.newContext(recordVideoOptions(videosDir))) {
@@ -59,7 +55,7 @@ void shouldExposeVideoPath(Browser browser, @TempDir Path videosDir) {
     assertTrue(Files.exists(path));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldSaveAsVideo(Browser browser, @TempDir Path videosDir) {
     Video video;
     try (BrowserContext context = browser.newContext(recordVideoOptions(videosDir))) {
@@ -73,7 +69,7 @@ void shouldSaveAsVideo(Browser browser, @TempDir Path videosDir) {
     assertTrue(Files.exists(saveAsPath));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldDeleteVideo(Browser browser, @TempDir Path videosDir) {
     Video video;
     try (BrowserContext context = browser.newContext(recordVideoOptions(videosDir))) {
@@ -86,9 +82,9 @@ void shouldDeleteVideo(Browser browser, @TempDir Path videosDir) {
     assertFalse(Files.exists(video.path()));
   }
 
-  @Test
+  @PlaywrightTest
   void shouldWaitForVideoFinishWhenPageIsClosed(BrowserType browserType, @TempDir Path videosDir) throws IOException {
-    try (Browser browser = browserType.launch(createLaunchOptions());
+    try (Browser browser = browserType.launch(Env.launchOptions());
          BrowserContext context = browser.newContext(recordVideoOptions(videosDir))) {
       Page page = context.newPage();
       page.evaluate("() => document.body.style.backgroundColor = 'red'");
@@ -102,7 +98,7 @@ void shouldWaitForVideoFinishWhenPageIsClosed(BrowserType browserType, @TempDir
     assertTrue(Files.size(files.get(0)) > 0);
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartShouldDeliverFramesViaOnFrame(Page page, Server server) {
     List<ScreencastFrame> frames = new ArrayList<>();
     page.screencast().start(new Screencast.StartOptions().setOnFrame(frames::add));
@@ -118,7 +114,7 @@ void screencastStartShouldDeliverFramesViaOnFrame(Page page, Server server) {
     }
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartShouldScaleFramesToFitSize(Browser browser, Server server) throws IOException {
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setViewportSize(1000, 400))) {
       Page page = context.newPage();
@@ -138,7 +134,7 @@ void screencastStartShouldScaleFramesToFitSize(Browser browser, Server server) t
     }
   }
 
-  @Test
+  @PlaywrightTest
   void onFrameShouldReceiveViewportSizeAndTimestamp(Browser browser, Server server) {
     try (BrowserContext context = browser.newContext(new Browser.NewContextOptions().setViewportSize(1000, 400))) {
       Page page = context.newPage();
@@ -157,7 +153,7 @@ void onFrameShouldReceiveViewportSizeAndTimestamp(Browser browser, Server server
     }
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartShouldRecordVideoWithTheRequestedFps(Page page, Server server, @TempDir Path tmpDir) throws IOException {
     Path videoPath = tmpDir.resolve("video.webm");
     page.screencast().start(new Screencast.StartOptions().setPath(videoPath).setFps(60));
@@ -169,14 +165,14 @@ void screencastStartShouldRecordVideoWithTheRequestedFps(Page page, Server serve
     assertTrue(Files.size(videoPath) > 0);
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartShouldThrowOnInvalidFps(Page page, @TempDir Path tmpDir) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.screencast().start(
       new Screencast.StartOptions().setPath(tmpDir.resolve("video.webm")).setFps(-1)));
     assertTrue(e.getMessage().contains("\"fps\" must be a positive number, got -1"), e.getMessage());
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartShouldThrowIfAlreadyStarted(Page page) {
     page.screencast().start(new Screencast.StartOptions().setOnFrame(data -> {}));
     PlaywrightException e = assertThrows(PlaywrightException.class,
@@ -185,7 +181,7 @@ void screencastStartShouldThrowIfAlreadyStarted(Page page) {
     page.screencast().stop();
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartShouldRecordVideoToPath(Page page, Server server, @TempDir Path tmpDir) throws IOException {
     Path videoPath = tmpDir.resolve("video.webm");
     page.screencast().start(new Screencast.StartOptions().setPath(videoPath));
@@ -197,7 +193,7 @@ void screencastStartShouldRecordVideoToPath(Page page, Server server, @TempDir P
     assertTrue(Files.size(videoPath) > 0);
   }
 
-  @Test
+  @PlaywrightTest
   void screencastStartReturnsDisposable(Page page) throws Exception {
     AutoCloseable disposable = page.screencast().start(new Screencast.StartOptions().setOnFrame(data -> {}));
     disposable.close();
@@ -206,7 +202,7 @@ void screencastStartReturnsDisposable(Page page) throws Exception {
     page.screencast().stop();
   }
 
-  @Test
+  @PlaywrightTest
   void screencastShowOverlay(Page page, Server server) throws Exception {
     page.navigate(server.EMPTY_PAGE);
     AutoCloseable disposable = page.screencast().showOverlay("<div>Hello Overlay</div>");
@@ -214,7 +210,7 @@ void screencastShowOverlay(Page page, Server server) throws Exception {
     disposable.close();
   }
 
-  @Test
+  @PlaywrightTest
   void screencastShowChapter(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.screencast().showChapter("Chapter Title");
@@ -222,7 +218,7 @@ void screencastShowChapter(Page page, Server server) {
       new Screencast.ShowChapterOptions().setDescription("Some details").setDuration(100));
   }
 
-  @Test
+  @PlaywrightTest
   void screencastHideShowOverlays(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.screencast().showOverlay("<div>visible</div>");
@@ -230,7 +226,7 @@ void screencastHideShowOverlays(Page page, Server server) {
     page.screencast().showOverlays();
   }
 
-  @Test
+  @PlaywrightTest
   void screencastShowAndHideActions(Page page, Server server) throws Exception {
     page.navigate(server.EMPTY_PAGE);
     AutoCloseable disposable = page.screencast().showActions();
@@ -239,7 +235,7 @@ void screencastShowAndHideActions(Page page, Server server) throws Exception {
     page.screencast().hideActions();
   }
 
-  @Test
+  @PlaywrightTest
   void screencastShowActionsShouldAcceptEveryPosition(Page page, Server server) throws Exception {
     page.navigate(server.EMPTY_PAGE);
     for (AnnotatePosition position : AnnotatePosition.values()) {
@@ -250,7 +246,7 @@ void screencastShowActionsShouldAcceptEveryPosition(Page page, Server server) th
     }
   }
 
-  @Test
+  @PlaywrightTest
   void screencastShowActionsShouldAcceptEveryCursor(Page page, Server server) throws Exception {
     page.navigate(server.EMPTY_PAGE);
     for (ScreencastCursor cursor : ScreencastCursor.values()) {
@@ -261,7 +257,7 @@ void screencastShowActionsShouldAcceptEveryCursor(Page page, Server server) thro
     }
   }
 
-  @Test
+  @PlaywrightTest
   void screencastShowActionsShouldRenderStyle(Page page, Server server) throws IOException {
     page.navigate(server.PREFIX + "/input/button.html");
     List<ScreencastFrame> frames = new ArrayList<>();
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java
index 6d553c4db..c6a158aa4 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsCss.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 @Tag("smoke")
-public class TestSelectorsCss extends TestBase {
+public class TestSelectorsCss {
 
-  @Test
-  void shouldWorkWithLargeDOM() {
+  @PlaywrightTest
+  void shouldWorkWithLargeDOM(Page page) {
     page.evaluate("() => {\n" +
       "  let id = 0;\n" +
       "  const next = (tag) => {\n" +
@@ -88,8 +88,8 @@ void shouldWorkWithLargeDOM() {
     }
   }
 
-  @Test
-  void shouldWorkForOpenShadowRoots() {
+  @PlaywrightTest
+  void shouldWorkForOpenShadowRoots(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals("Hello from root1", page.evalOnSelector("css=span", "e => e.textContent"));
     assertEquals("Hello from root3 #2", page.evalOnSelector("css=[attr=\"value\\ space\"]", "e => e.textContent"));
@@ -118,8 +118,8 @@ void shouldWorkForOpenShadowRoots() {
     assertNull(root3.querySelector("css:light=[attr*=\"value\"]"));
   }
 
-  @Test
-  void shouldWorkWithGreaterThanCombinatorAndSpaces() {
+  @PlaywrightTest
+  void shouldWorkWithGreaterThanCombinatorAndSpaces(Page page) {
     page.setContent("<div foo=\"bar\" bar=\"baz\"><span></span></div>");
     assertEquals("<span></span>", page.evalOnSelector("div[foo=\"bar\"] > span", "e => e.outerHTML"));
     assertEquals("<span></span>", page.evalOnSelector("div[foo=\"bar\"]> span", "e => e.outerHTML"));
@@ -137,8 +137,8 @@ void shouldWorkWithGreaterThanCombinatorAndSpaces() {
     assertEquals("<span></span>", page.evalOnSelector("div[foo=\"bar\"][bar=\"baz\"]     >span", "e => e.outerHTML"));
   }
 
-  @Test
-  void shouldWorkWithCommaSeparatedList() {
+  @PlaywrightTest
+  void shouldWorkWithCommaSeparatedList(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals(5, page.evalOnSelectorAll("css=span,section #root1", "els => els.length"));
     assertEquals(5, page.evalOnSelectorAll("css=section #root1, div span", "els => els.length"));
@@ -151,8 +151,8 @@ void shouldWorkWithCommaSeparatedList() {
     assertEquals(4, page.evalOnSelectorAll("css=#target,[data-testid=\"foo\"],[attr=\"value\\ space\"],span", "els => els.length"));
   }
 
-  @Test
-  void shouldKeepDomOrderWithCommaSeparatedList() {
+  @PlaywrightTest
+  void shouldKeepDomOrderWithCommaSeparatedList(Page page) {
     page.setContent("<section><span><div><x></x><y></y></div></span></section>");
     assertEquals("SPAN,DIV", page.evalOnSelectorAll("css=span,div", "els => els.map(e => e.nodeName).join(',')"));
     assertEquals("SPAN,DIV", page.evalOnSelectorAll("css=div,span", "els => els.map(e => e.nodeName).join(',')"));
@@ -163,8 +163,8 @@ void shouldKeepDomOrderWithCommaSeparatedList() {
     assertEquals("SPAN,DIV", page.evalOnSelectorAll("css=section >> *css=div,span >> css=y", "els => els.map(e => e.nodeName).join(',')"));
   }
 
-  @Test
-  void shouldWorkWithCommaSeparatedListInVariousPosition() {
+  @PlaywrightTest
+  void shouldWorkWithCommaSeparatedListInVariousPosition(Page page) {
     page.setContent("<section><span><div><x></x><y></y></div></span></section>");
     assertEquals("X,Y", page.evalOnSelectorAll("css=span,div >> css=x,y", "els => els.map(e => e.nodeName).join(',')"));
     assertEquals("X", page.evalOnSelectorAll("css=span,div >> css=x", "els => els.map(e => e.nodeName).join(',')"));
@@ -177,8 +177,8 @@ void shouldWorkWithCommaSeparatedListInVariousPosition() {
     assertEquals("X,Y", page.evalOnSelectorAll("css=section >> css=span >> css=x,y", "els => els.map(e => e.nodeName).join(',')"));
   }
 
-  @Test
-  void shouldWorkWithCommaInsideText() {
+  @PlaywrightTest
+  void shouldWorkWithCommaInsideText(Page page) {
     page.setContent("<span></span><div attr=\"hello,world!\"></div>");
     assertEquals("<div attr=\"hello,world!\"></div>", page.evalOnSelector("css=div[attr=\"hello,world!\"]", "e => e.outerHTML"));
     assertEquals("<div attr=\"hello,world!\"></div>", page.evalOnSelector("css=[attr=\"hello,world!\"]", "e => e.outerHTML"));
@@ -187,8 +187,8 @@ void shouldWorkWithCommaInsideText() {
     assertEquals("<span></span>", page.evalOnSelector("css=div[attr=\"hello,world!\"],span", "e => e.outerHTML"));
   }
 
-  @Test
-  void shouldWorkWithAttributeSelectors() {
+  @PlaywrightTest
+  void shouldWorkWithAttributeSelectors(Page page) {
     page.setContent("<div attr=\"hello world\" attr2=\"hello-''>>foo=bar[]\" attr3=\"] span\"><span></span></div>");
     page.evaluate("() => window['div'] = document.querySelector('div')");
     List<String> selectors = Arrays.asList(
@@ -213,22 +213,22 @@ void shouldWorkWithAttributeSelectors() {
     assertTrue((Boolean) page.evalOnSelector("[attr3=\"] span\"] >> span", "e => e.parentNode === window['div']"));
   }
 
-  @Test
-  void shouldNotMatchRootAfterGreaterGreaterThan() {
+  @PlaywrightTest
+  void shouldNotMatchRootAfterGreaterGreaterThan(Page page) {
     page.setContent("<section><div>test</div></section>");
     ElementHandle element = page.querySelector("css=section >> css=section");
     assertNull(element);
   }
 
-  @Test
-  void shouldWorkWithNumericalId() {
+  @PlaywrightTest
+  void shouldWorkWithNumericalId(Page page) {
     page.setContent("<section id=\"123\"></section>");
     ElementHandle element = page.querySelector("#\\31\\32\\33");
     assertNotNull(element);
   }
 
-  @Test
-  void shouldWorkWithWrongCaseId() {
+  @PlaywrightTest
+  void shouldWorkWithWrongCaseId(Page page) {
     page.setContent("<section id=\"Hello\"></section>");
     assertEquals("SECTION", page.evalOnSelector("#Hello", "e => e.tagName"));
     assertEquals("SECTION", page.evalOnSelector("#hello", "e => e.tagName"));
@@ -236,8 +236,8 @@ void shouldWorkWithWrongCaseId() {
     assertEquals("SECTION", page.evalOnSelector("#helLO", "e => e.tagName"));
   }
 
-  @Test
-  void shouldWorkWithAsterisk() {
+  @PlaywrightTest
+  void shouldWorkWithAsterisk(Page page) {
     page.setContent("<div id=div1></div><div id=div2><span><span></span></span></div>");
     // Includes html, head and body.
     assertEquals(7, page.evalOnSelectorAll("*", "els => els.length"));
@@ -276,8 +276,8 @@ void shouldWorkWithAsterisk() {
     assertEquals(0, body.evalOnSelectorAll("* *:not(span)", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithColonNthChild(){
+  @PlaywrightTest
+  void shouldWorkWithColonNthChild(Page page, Server server){
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals(3, page.evalOnSelectorAll("css=span:nth-child(odd)", "els => els.length"));
     assertEquals(1, page.evalOnSelectorAll("css=span:nth-child(even)", "els => els.length"));
@@ -291,16 +291,16 @@ void shouldWorkWithColonNthChild(){
     assertEquals(1, page.evalOnSelectorAll("css=span:nth-child(23n+2)", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithColonNot() {
+  @PlaywrightTest
+  void shouldWorkWithColonNot(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals(2, page.evalOnSelectorAll("css=div:not(#root1)", "els => els.length"));
     assertEquals(4, page.evalOnSelectorAll("css=body :not(span)", "els => els.length"));
     assertEquals(0, page.evalOnSelectorAll("css=div > :not(span):not(div)", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithTilde() {
+  @PlaywrightTest
+  void shouldWorkWithTilde(Page page) {
     page.setContent(
       "<div id=div1></div>\n" +
       "<div id=div2></div>\n" +
@@ -318,8 +318,8 @@ void shouldWorkWithTilde() {
     assertEquals(1, page.evalOnSelectorAll("css=#div3 ~ #div4 ~ #div5", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithPlus() {
+  @PlaywrightTest
+  void shouldWorkWithPlus(Page page) {
     page.setContent(
       "<section>\n" +
       "  <div id=div1></div>\n" +
@@ -344,8 +344,8 @@ void shouldWorkWithPlus() {
     assertEquals(0, page.evalOnSelectorAll("css=section:has(:scope > div + #div1)", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithSpacesInColonNthChildAndColonNot() {
+  @PlaywrightTest
+  void shouldWorkWithSpacesInColonNthChildAndColonNot(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals(1, page.evalOnSelectorAll("css=span:nth-child(23n +2)", "els => els.length"));
     assertEquals(1, page.evalOnSelectorAll("css=span:nth-child(23n+ 2)", "els => els.length"));
@@ -359,8 +359,8 @@ void shouldWorkWithSpacesInColonNthChildAndColonNot() {
     assertEquals(1, page.evalOnSelectorAll("span:nth-child(23n+ 2) >> xpath=.", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithColonIs() {
+  @PlaywrightTest
+  void shouldWorkWithColonIs(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals(1, page.evalOnSelectorAll("css=div:is(#root1)", "els => els.length"));
     assertEquals(1, page.evalOnSelectorAll("css=div:is(#root1, #target)", "els => els.length"));
@@ -374,16 +374,16 @@ void shouldWorkWithColonIs() {
     assertEquals(1, page.evalOnSelectorAll("css=#root1:has(:is(:scope, #root1))", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithColonHas() {
+  @PlaywrightTest
+  void shouldWorkWithColonHas(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     assertEquals(2, page.evalOnSelectorAll("css=div:has(#target)", "els => els.length"));
     assertEquals(3, page.evalOnSelectorAll("css=div:has([data-testid=foo])", "els => els.length"));
     assertEquals(2, page.evalOnSelectorAll("css=div:has([attr*=value])", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithColonScope() {
+  @PlaywrightTest
+  void shouldWorkWithColonScope(Page page, Server server) {
     page.navigate(server.PREFIX + "/deep-shadow.html");
     // 'is' does not change the scope, so it remains 'html'.
     assertEquals(0, page.evalOnSelectorAll("css=div:is(:scope#root1)", "els => els.length"));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java
index da1f729cf..4d8d2b0fc 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsGetBy.java
@@ -17,9 +17,9 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.LocatorAssertions;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.regex.Pattern;
@@ -28,22 +28,22 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestSelectorsGetBy extends TestBase {
+public class TestSelectorsGetBy {
 
   @AfterEach
-  void resetTestId() {
+  void resetTestId(Playwright playwright) {
     playwright.selectors().setTestIdAttribute("data-testid");
   }
-  @Test
-  void getByTestIdShouldWork() {
+  @PlaywrightTest
+  void getByTestIdShouldWork(Page page) {
     page.setContent("<div><div data-testid='Hello'>Hello world</div></div>");
     assertThat(page.getByTestId("Hello")).hasText("Hello world");
     assertThat(page.mainFrame().getByTestId("Hello")).hasText("Hello world");
     assertThat(page.locator("div").getByTestId("Hello")).hasText("Hello world");
   }
 
-  @Test
-  void getByTestIdWithCustomTestIdShouldWork() {
+  @PlaywrightTest
+  void getByTestIdWithCustomTestIdShouldWork(Page page, Playwright playwright) {
     page.setContent("<div><div data-my-custom-testid='Hello'>Hello world</div></div>");
     playwright.selectors().setTestIdAttribute("data-my-custom-testid");
     assertThat(page.getByTestId("Hello")).hasText("Hello world");
@@ -51,8 +51,8 @@ void getByTestIdWithCustomTestIdShouldWork() {
     assertThat(page.locator("div").getByTestId("Hello")).hasText("Hello world");
   }
 
-  @Test
-  void getByTestIdWithCommaSeparatedTestIdAttributesShouldMatchAny() {
+  @PlaywrightTest
+  void getByTestIdWithCommaSeparatedTestIdAttributesShouldMatchAny(Page page, Playwright playwright) {
     page.setContent("<section>\n" +
       "  <div data-pw='Hello'>first</div>\n" +
       "  <div data-ti='Hello'>second</div>\n" +
@@ -65,8 +65,8 @@ void getByTestIdWithCommaSeparatedTestIdAttributesShouldMatchAny() {
     assertThat(page.locator("section").getByTestId("Hello")).hasCount(2);
   }
 
-  @Test
-  void shouldUseDataTestidInStrictErrors() {
+  @PlaywrightTest
+  void shouldUseDataTestidInStrictErrors(Page page, Playwright playwright) {
     playwright.selectors().setTestIdAttribute("data-custom-id");
     page.setContent("" +
       "      <div>\n" +
@@ -91,22 +91,22 @@ void shouldUseDataTestidInStrictErrors() {
   }
 
 
-  @Test
-  void getByTestIdShouldEscapeId() {
+  @PlaywrightTest
+  void getByTestIdShouldEscapeId(Page page) {
     page.setContent("<div><div data-testid='He\"llo'>Hello world</div></div>");
     assertThat(page.getByTestId("He\"llo")).hasText("Hello world");
   }
 
-  @Test
-  void getByTestIdShouldWorkForRegex() {
+  @PlaywrightTest
+  void getByTestIdShouldWorkForRegex(Page page) {
     page.setContent("<div><div data-testid='Hello'>Hello world</div></div>");
     assertThat(page.getByTestId(Pattern.compile("He[l]*o"))).hasText("Hello world");
     assertThat(page.mainFrame().getByTestId("Hello")).hasText("Hello world");
     assertThat(page.locator("div").getByTestId("Hello")).hasText("Hello world");
   }
 
-  @Test
-  void getByTextShouldWork() {
+  @PlaywrightTest
+  void getByTextShouldWork(Page page) {
     page.setContent("<div>yo</div><div>ya</div><div>\nye  </div>");
     assertTrue(((String) page.getByText("ye").evaluate("e => e.outerHTML")).contains(">\nye  </div>"));
     assertTrue(((String) page.getByText(Pattern.compile("ye")).evaluate("e => e.outerHTML")).contains(">\nye  </div>"));
@@ -119,8 +119,8 @@ void getByTextShouldWork() {
     assertEquals("<div>Hello</div>", page.getByText("Hello", new Page.GetByTextOptions().setExact(true)).evaluate("e => e.outerHTML"));
   }
 
-  @Test
-  void getByLabelShouldWork() {
+  @PlaywrightTest
+  void getByLabelShouldWork(Page page) {
     page.setContent("<div><label for=target>Name</label><input id=target type=text></div>");
     assertEquals("LABEL", page.getByText("Name").evaluate("e => e.nodeName"));
     assertEquals("INPUT", page.getByLabel("Name").evaluate("e => e.nodeName"));
@@ -128,8 +128,8 @@ void getByLabelShouldWork() {
     assertEquals("INPUT", page.locator("div").getByLabel("Name").evaluate("e => e.nodeName"));
   }
 
-  @Test
-  void getByLabelShouldWorkWithNestedElements() {
+  @PlaywrightTest
+  void getByLabelShouldWorkWithNestedElements(Page page) {
     page.setContent("<label for=target>Last <span>Name</span></label><input id=target type=text>");
 
     assertThat(page.getByLabel("last name")).hasAttribute("id", "target");
@@ -145,8 +145,8 @@ void getByLabelShouldWorkWithNestedElements() {
     assertEquals(Collections.emptyList(), page.getByLabel(Pattern.compile("last name")).elementHandles());
   }
 
-  @Test
-  void getByPlaceholderShouldWork() {
+  @PlaywrightTest
+  void getByPlaceholderShouldWork(Page page) {
     page.setContent("<div>\n" +
       "    <input placeholder='Hello'>\n" +
       "    <input placeholder='Hello World'>\n" +
@@ -160,8 +160,8 @@ void getByPlaceholderShouldWork() {
     assertThat(page.locator("div").getByPlaceholder("hello")).hasCount(2);
   }
 
-  @Test
-  void getByAltTextShouldWork() {
+  @PlaywrightTest
+  void getByAltTextShouldWork(Page page) {
     page.setContent("<div>\n" +
       "    <input alt='Hello'>\n" +
       "    <input alt='Hello World'>\n" +
@@ -175,8 +175,8 @@ void getByAltTextShouldWork() {
     assertThat(page.locator("div").getByAltText("hello")).hasCount(2);
   }
 
-  @Test
-  void getByTitleShouldWork() {
+  @PlaywrightTest
+  void getByTitleShouldWork(Page page) {
     page.setContent("<div>\n" +
       "    <input title='Hello'>\n" +
       "    <input title='Hello World'>\n" +
@@ -190,8 +190,8 @@ void getByTitleShouldWork() {
     assertThat(page.locator("div").getByTitle("hello")).hasCount(2);
   }
 
-  @Test
-  void getByEscaping() {
+  @PlaywrightTest
+  void getByEscaping(Page page) {
     page.setContent("<label id=label for=control>Hello my\n" +
       "wo\"rld</label><input id=control />");
     page.evalOnSelector("input", "input => {\n" +
@@ -245,8 +245,8 @@ void getByEscaping() {
     assertThat(page.getByTitle(Pattern.compile("foo >> bar"))).hasAttribute("id", "target");
   }
 
-  @Test
-  void getByRoleEscaping() {
+  @PlaywrightTest
+  void getByRoleEscaping(Page page) {
     page.setContent("<a href=\"https://playwright.dev\">issues 123</a>\n" +
       "    <a href=\"https://playwright.dev\">he llo 56</a>\n" +
       "    <button>Click me</button>");
@@ -286,8 +286,8 @@ void getByRoleEscaping() {
       page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Click \\\\me").setExact(true)).evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void locatorGetByRole() {
+  @PlaywrightTest
+  void locatorGetByRole(Page page) {
     page.setContent("<div><button>Click me</button></div>");
     assertEquals(
       asList("<button>Click me</button>"),
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsMisc.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsMisc.java
index 117353387..228bf9631 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsMisc.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsMisc.java
@@ -16,15 +16,15 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestSelectorsMisc extends TestBase {
+public class TestSelectorsMisc {
 
-  @Test
-  void shouldWorkWithLayoutSelectors() {
+  @PlaywrightTest
+  void shouldWorkWithLayoutSelectors(Page page) {
   /*
 
        +--+  +--+
@@ -212,8 +212,8 @@ void shouldWorkWithLayoutSelectors() {
     assertTrue(e.getMessage().contains("Malformed selector: left-of='span',3,4"));
   }
 
-  @Test
-  void shouldWorkWithInternalHasNot() {
+  @PlaywrightTest
+  void shouldWorkWithInternalHasNot(Page page) {
     page.setContent("<section><span></span><div></div></section><section><br></section>");
     assertEquals(1, page.evalOnSelectorAll("section >> internal:has-not=\"span\"", "els => els.length"));
     assertEquals(0, page.evalOnSelectorAll("section >> internal:has-not=\"span, div, br\"", "els => els.length"));
@@ -222,8 +222,8 @@ void shouldWorkWithInternalHasNot() {
     assertEquals(2, page.evalOnSelectorAll("section >> internal:has-not=\"article\"", "els => els.length"));
   }
 
-  @Test
-  void shouldWorkWithInternalAnd() {
+  @PlaywrightTest
+  void shouldWorkWithInternalAnd(Page page) {
     page.setContent("<div class=foo>hello</div><div class=bar>world</div>\n" +
       "    <span class=foo>hello2</span><span class=bar>world2</span>");
     assertEquals(asList(), page.evalOnSelectorAll("div >> internal:and=\"span\"", "els => els.map(e => e.textContent)"));
@@ -234,8 +234,8 @@ void shouldWorkWithInternalAnd() {
     assertEquals(asList("world2"), page.evalOnSelectorAll(".bar >> internal:and=\"span\"", "els => els.map(e => e.textContent)"));
   }
 
-  @Test
-  void shouldWorkWithInternalOr() {
+  @PlaywrightTest
+  void shouldWorkWithInternalOr(Page page) {
     page.setContent("<div>hello</div>\n" +
       "    <span>world</span>");
     assertEquals(asList("hello", "world"), page.evalOnSelectorAll("div >> internal:or=\"span\"", "els => els.map(e => e.textContent)"));
@@ -246,8 +246,8 @@ void shouldWorkWithInternalOr() {
     assertEquals("hello", page.locator("div >> internal:or=\"article\"").textContent());
     assertEquals("world", page.locator("span >> internal:or=\"article\"").textContent());
   }
-  @Test
-  void shouldWorkWithInternalChain() {
+  @PlaywrightTest
+  void shouldWorkWithInternalChain(Page page) {
     page.setContent("<div>one <span>two</span> <button>three</button> </div>\n" +
       "    <span>four</span>\n" +
       "    <button>five</button>");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRegister.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRegister.java
index 1c6cbcc0c..84acad834 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRegister.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRegister.java
@@ -16,13 +16,13 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.nio.file.Paths;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestSelectorsRegister extends TestBase {
+public class TestSelectorsRegister {
   private static final String TAG_SELECTOR_SCRIPT = "{\n" +
     "  create(root, target) {\n" +
     "    return target.nodeName;\n" +
@@ -35,8 +35,8 @@ public class TestSelectorsRegister extends TestBase {
     "  }\n" +
     "}";
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Browser browser, Playwright playwright) {
     // Register one engine before creating context.
     playwright.selectors().register("tag", TAG_SELECTOR_SCRIPT);
 
@@ -62,15 +62,15 @@ void shouldWork() {
     context.close();
   }
 
-  @Test
-  void shouldWorkWithPath() {
+  @PlaywrightTest
+  void shouldWorkWithPath(Page page, Playwright playwright) {
     playwright.selectors().register("foo", Paths.get("src/test/resources/sectionselectorengine.js"));
     page.setContent("<section></section>");
     assertEquals("SECTION", page.evalOnSelector("foo=whatever", "e => e.nodeName"));
   }
 
-  @Test
-  void shouldWorkInMainAndIsolatedWorld() {
+  @PlaywrightTest
+  void shouldWorkInMainAndIsolatedWorld(Page page, Playwright playwright) {
     String createDummySelector = "{\n" +
       "  create(root, target) { },\n" +
       "  query(root, selector) {\n" +
@@ -102,8 +102,8 @@ void shouldWorkInMainAndIsolatedWorld() {
     assertEquals("SECTION", page.evalOnSelector("main=ignored >> css=section", "e => e.nodeName"));
   }
 
-  @Test
-  void shouldHandleErrors() {
+  @PlaywrightTest
+  void shouldHandleErrors(Page page, Playwright playwright) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.querySelector("neverregister=ignored");
     });
@@ -136,8 +136,8 @@ void shouldHandleErrors() {
     assertTrue(e.getMessage().contains("\"css\" is a predefined selector engine"));
   }
 
-  @Test
-  void shouldThrowAlreadyRegisteredErrorWhenRegistering() {
+  @PlaywrightTest
+  void shouldThrowAlreadyRegisteredErrorWhenRegistering(BrowserContext context, Playwright playwright) {
     // https://github.com/microsoft/playwright/issues/36467
 
     // this test is about the exception *before* there's a context created
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java
index 827c06ae4..d1032752a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsRole.java
@@ -16,19 +16,19 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
-import org.junit.jupiter.api.Test;
-import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
 import java.util.regex.Pattern;
 
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestSelectorsRole extends TestBase {
-  @Test
-  void shouldDetectRoles() {
+public class TestSelectorsRole {
+  @PlaywrightTest
+  void shouldDetectRoles(Page page) {
     page.setContent("<button>Hello</button>\n" +
       "    <select multiple=\"\" size=\"2\"></select>\n" +
       "    <select></select>\n" +
@@ -52,8 +52,8 @@ void shouldDetectRoles() {
     assertEquals(emptyList(), page.getByRole(AriaRole.MENUITEM).evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldSupportSelected() {
+  @PlaywrightTest
+  void shouldSupportSelected(Page page) {
     page.setContent("<select>\n" +
       "      <option>Hi</option>\n" +
       "      <option selected>Hello</option>\n" +
@@ -87,8 +87,8 @@ void shouldSupportSelected() {
     ), page.getByRole(AriaRole.OPTION, new Page.GetByRoleOptions().setSelected(false)).evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldSupportChecked() {
+  @PlaywrightTest
+  void shouldSupportChecked(Page page) {
     page.setContent("<input type=checkbox>\n" +
       "    <input type=checkbox checked>\n" +
       "    <input type=checkbox indeterminate>\n" +
@@ -134,8 +134,8 @@ void shouldSupportChecked() {
     ), page.locator("role=checkbox").evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldSupportPressed() {
+  @PlaywrightTest
+  void shouldSupportPressed(Page page) {
     page.setContent("<button>Hi</button>\n" +
       "    <button aria-pressed=\"true\">Hello</button>\n" +
       "    <button aria-pressed=\"false\">Bye</button>\n" +
@@ -168,8 +168,8 @@ void shouldSupportPressed() {
     ), page.locator("role=button").evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldSupportExpanded() {
+  @PlaywrightTest
+  void shouldSupportExpanded(Page page) {
     page.setContent("<div role=\"treeitem\">Hi</div>\n" +
       "    <div role=\"treeitem\" aria-expanded=\"true\">Hello</div>\n" +
       "    <div role=\"treeitem\" aria-expanded=\"false\">Bye</div>");
@@ -208,8 +208,8 @@ void shouldSupportExpanded() {
     ), page.locator("[role=treeitem]:not([aria-expanded])").evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldSupportDisabled() {
+  @PlaywrightTest
+  void shouldSupportDisabled(Page page) {
     page.setContent("<button>Hi</button>\n" +
       "    <button disabled>Bye</button>\n" +
       "    <button aria-disabled=\"true\">Hello</button>\n" +
@@ -242,8 +242,8 @@ void shouldSupportDisabled() {
       ), page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setDisabled(false)).evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldInheritDisabledFromTheAncestor() {
+  @PlaywrightTest
+  void shouldInheritDisabledFromTheAncestor(Page page) {
     page.setContent(
       "<span aria-disabled=\"true\">\n" +
       "  <button>Click me!</button>\n" +
@@ -258,8 +258,8 @@ void shouldInheritDisabledFromTheAncestor() {
     assertThat(page.locator("h1")).isEnabled();
   }
 
-  @Test
-  void shouldSupportDisabledFieldset() {
+  @PlaywrightTest
+  void shouldSupportDisabledFieldset(Page page) {
     page.setContent(
       "<fieldset disabled>\n" +
       "  <input></input>\n" +
@@ -302,8 +302,8 @@ void shouldSupportDisabledFieldset() {
     assertThat(page.getByTestId("deep-button")).isDisabled();
   }
 
-  @Test
-  void shouldSupportLevel() {
+  @PlaywrightTest
+  void shouldSupportLevel(Page page) {
     page.setContent("<h1>Hello</h1>\n" +
       "    <h3>Hi</h3>\n" +
       "    <div role=\"heading\" aria-level=\"5\">Bye</div>");
@@ -324,8 +324,8 @@ void shouldSupportLevel() {
       ), page.locator("role=heading[level=5]").evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldFilterHiddenUnlessExplicitlyAskedFor() {
+  @PlaywrightTest
+  void shouldFilterHiddenUnlessExplicitlyAskedFor(Page page) {
     page.setContent("<button>Hi</button>\n" +
       "    <button hidden>Hello</button>\n" +
       "    <button aria-hidden=\"true\">Yay</button>\n" +
@@ -388,8 +388,8 @@ void shouldFilterHiddenUnlessExplicitlyAskedFor() {
     ), page.locator("role=button[include-hidden=false]").evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void shouldSupportName() {
+  @PlaywrightTest
+  void shouldSupportName(Page page) {
     page.setContent("<div role=\"button\" aria-label=\" Hello \"></div>\n" +
       "    <div role=\"button\" aria-label=\"Hallo\"></div>\n" +
       "    <div role=\"button\" aria-label=\"Hello\" aria-hidden=\"true\"></div>\n" +
@@ -442,8 +442,8 @@ void shouldSupportName() {
       ), page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("123").setIncludeHidden(true)).evaluateAll("els => els.map(e => e.outerHTML)"));
   }
 
-  @Test
-  void errors() {
+  @PlaywrightTest
+  void errors(Page page) {
     PlaywrightException e0 = assertThrows(PlaywrightException.class, () -> page.querySelector("role=[bar]"));
     assertTrue(e0.getMessage().contains("Role must not be empty"), e0.getMessage());
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsText.java b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsText.java
index 7e16a1a1d..ad12ce92c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestSelectorsText.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestSelectorsText.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.regex.Pattern;
 
@@ -24,10 +24,10 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestSelectorsText extends TestBase {
+public class TestSelectorsText {
 
-  @Test
-  void shouldWorkSmoke() {
+  @PlaywrightTest
+  void shouldWorkSmoke(Page page) {
     page.setContent("<div>Hi&gt;&gt;<span></span></div>");
     assertEquals("<span></span>", page.evalOnSelector("text=\"Hi>>\">>span", "e => e.outerHTML"));
     assertEquals("<span></span>", page.evalOnSelector("text=/Hi\\>\\>/ >> span", "e => e.outerHTML"));
@@ -37,8 +37,8 @@ void shouldWorkSmoke() {
     assertEquals("<span>hello</span>", page.evalOnSelector("text=/let\'s/i >> span", "e => e.outerHTML"));
   }
 
-  @Test
-  void hasTextAndInternalTextShouldMatchFullNodeTextInStrictMode() {
+  @PlaywrightTest
+  void hasTextAndInternalTextShouldMatchFullNodeTextInStrictMode(Page page) {
     page.setContent("<div id=div1>hello<span>world</span></div>\n" +
       "    <div id=div2>hello</div>");
     assertThat(page.getByText("helloworld", new Page.GetByTextOptions().setExact(true))).hasId("div1");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestTap.java b/playwright/src/test/java/com/microsoft/playwright/TestTap.java
index 452730604..64aa77716 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestTap.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestTap.java
@@ -16,7 +16,8 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
@@ -27,11 +28,11 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestTap extends TestBase {
+public class TestTap {
 
-  @Override
-  BrowserContext createContext() {
-    return browser.newContext(new Browser.NewContextOptions().setHasTouch(true));
+  @Fixture
+  Browser.NewContextOptions contextOptions() {
+    return new Browser.NewContextOptions().setHasTouch(true);
   }
 
   private JSHandle trackEvents(ElementHandle target) {
@@ -46,8 +47,8 @@ private JSHandle trackEvents(ElementHandle target) {
       "}");
   }
 
-  @Test
-  void shouldSendAllOfTheCorrectEvents() {
+  @PlaywrightTest
+  void shouldSendAllOfTheCorrectEvents(Page page) {
     page.setContent("<div id='a' style='background: lightblue; width: 50px; height: 50px'>a</div>\n" +
       "<div id='b' style='background: pink; width: 50px; height: 50px'>b</div>");
     page.tap("#a");
@@ -64,8 +65,8 @@ void shouldSendAllOfTheCorrectEvents() {
       eventsHandle.jsonValue());
   }
 
-  @Test
-  void shouldNotSendMouseEventsTouchstartIsCanceled() {
+  @PlaywrightTest
+  void shouldNotSendMouseEventsTouchstartIsCanceled(Page page) {
     page.setContent("<div style='width: 50px; height: 50px; background: red'>");
     page.evaluate("() => {\n" +
       "    // touchstart is not cancelable unless passive is false\n" +
@@ -80,8 +81,8 @@ void shouldNotSendMouseEventsTouchstartIsCanceled() {
       eventsHandle.jsonValue());
   }
 
-  @Test
-  void shouldNotSendMouseEventsWhenTouchendIsCanceled() {
+  @PlaywrightTest
+  void shouldNotSendMouseEventsWhenTouchendIsCanceled(Page page) {
     page.setContent("<div style='width: 50px; height: 50px; background: red'>");
     page.evaluate("() => document.addEventListener('touchend', t => t.preventDefault())");
     JSHandle eventsHandle = trackEvents(page.querySelector("div"));
@@ -93,8 +94,8 @@ void shouldNotSendMouseEventsWhenTouchendIsCanceled() {
       eventsHandle.jsonValue());
   }
 
-  @Test
-  void shouldNotWaitForANavigationCausedByATap() throws InterruptedException, ExecutionException {
+  @PlaywrightTest
+  void shouldNotWaitForANavigationCausedByATap(Page page, Server server) throws InterruptedException, ExecutionException {
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<a href='/intercept-this.html'>link</a>;");
     Future<Server.Request> serverReq = server.futureRequest("/intercept-this.html");
@@ -103,8 +104,8 @@ void shouldNotWaitForANavigationCausedByATap() throws InterruptedException, Exec
     serverReq.get();
   }
 
-  @Test
-  void shouldWorkWithModifiers() {
+  @PlaywrightTest
+  void shouldWorkWithModifiers(Page page) {
     page.setContent("hello world");
     page.evaluate("() => {\n" +
       "  window.touchPromise = new Promise(resolve => {\n" +
@@ -118,8 +119,8 @@ void shouldWorkWithModifiers() {
     assertEquals(true, altKey);
   }
 
-  @Test
-  void shouldSendWellFormedTouchPoints() {
+  @PlaywrightTest
+  void shouldSendWellFormedTouchPoints(Page page) {
     page.evaluate("() => {\n" +
       "  window.touchStartPromise = new Promise(resolve => {\n" +
       "      document.addEventListener('touchstart', event => {\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestTracing.java b/playwright/src/test/java/com/microsoft/playwright/TestTracing.java
index f27a8018a..c02dc3b57 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestTracing.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestTracing.java
@@ -18,13 +18,12 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.AriaRole;
 import com.microsoft.playwright.options.Location;
 import com.microsoft.playwright.options.MouseButton;
-
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -42,23 +41,9 @@
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestTracing extends TestBase {
-  @Override
-  @BeforeAll
-  void launchBrowser() {
-    // The method is replaced by the method below (with temp dir as extra parameter,
-    // we cannot declare temp dir field as it would be initialized too late).
-  }
-
-  @BeforeAll
-  void launchBrowser(@TempDir Path tempDir) {
-    BrowserType.LaunchOptions options = createLaunchOptions();
-    options.setTracesDir(tempDir.resolve("trace-dir"));
-    launchBrowser(options);
-  }
-
-  @Test
-  void shouldCollectTrace1(@TempDir Path tempDir) throws Exception {
+public class TestTracing {
+  @PlaywrightTest
+  void shouldCollectTrace1(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions().setName("test")
       .setScreenshots(true).setSnapshots(true));
     page.navigate(server.EMPTY_PAGE);
@@ -69,7 +54,7 @@ void shouldCollectTrace1(@TempDir Path tempDir) throws Exception {
     context.tracing().stop(new Tracing.StopOptions().setPath(traceFile));
 
     assertTrue(Files.exists(traceFile));
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Navigate.*/empty.html"),
         Pattern.compile("Set content"),
@@ -79,8 +64,8 @@ void shouldCollectTrace1(@TempDir Path tempDir) throws Exception {
     });
   }
 
-  @Test
-  void shouldCollectTwoTraces(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldCollectTwoTraces(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions().setName("test1")
       .setScreenshots(true).setSnapshots(true));
     page.navigate(server.EMPTY_PAGE);
@@ -99,7 +84,7 @@ void shouldCollectTwoTraces(@TempDir Path tempDir) throws Exception {
     assertTrue(Files.exists(traceFile1));
     assertTrue(Files.exists(traceFile2));
     
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Navigate.*/empty.html"),
         Pattern.compile("Set content"),
@@ -107,7 +92,7 @@ void shouldCollectTwoTraces(@TempDir Path tempDir) throws Exception {
       });
     });
     
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile2, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile2, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Double click"),
         Pattern.compile("Close")
@@ -115,8 +100,8 @@ void shouldCollectTwoTraces(@TempDir Path tempDir) throws Exception {
     });
   }
 
-  @Test
-  void shouldWorkWithMultipleChunks(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldWorkWithMultipleChunks(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions().setScreenshots(true).setSnapshots(true));
     page.navigate(server.PREFIX + "/frames/frame.html");
 
@@ -134,7 +119,7 @@ void shouldWorkWithMultipleChunks(@TempDir Path tempDir) throws Exception {
     assertTrue(Files.exists(traceFile1));
     assertTrue(Files.exists(traceFile2));
     
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Set content"),
         Pattern.compile("Click")
@@ -144,24 +129,24 @@ void shouldWorkWithMultipleChunks(@TempDir Path tempDir) throws Exception {
       assertThat(frame.locator("button")).hasText("Click");
     });
     
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile2, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile2, traceViewer -> {
       assertThat(traceViewer.actionTitles()).containsText(new String[] {"Hover"});
       FrameLocator frame = traceViewer.snapshotFrame("Hover", 0, false);
       assertThat(frame.locator("button")).hasText("Click");
     });
   }
 
-  @Test
-  void shouldCollectSources(@TempDir Path tmpDir) throws Exception {
+  @PlaywrightTest
+  void shouldCollectSources(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tmpDir) throws Exception {
     Assumptions.assumeTrue(System.getenv("PLAYWRIGHT_JAVA_SRC") != null, "PLAYWRIGHT_JAVA_SRC must point to the directory containing this test source.");
     context.tracing().start(new Tracing.StartOptions().setSources(true));
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<button>Click</button>");
-    myMethodOuter();
+    myMethodOuter(page);
     Path trace = tmpDir.resolve("trace1.zip");
     context.tracing().stop(new Tracing.StopOptions().setPath(trace));
 
-    TraceViewerPage.showTraceViewer(this.browserType, trace, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, trace, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Navigate.*/empty.html"),
         Pattern.compile("Set content"),
@@ -182,24 +167,24 @@ void shouldCollectSources(@TempDir Path tmpDir) throws Exception {
     });
   }
 
-  private void myMethodOuter() {
-    myMethodInner();
+  private void myMethodOuter(Page page) {
+    myMethodInner(page);
   }
 
-  private void myMethodInner() {
+  private void myMethodInner(Page page) {
     page.getByText("Click").click();
   }
 
-  @Test
-  void shouldNotFailWhenSourcesSetExplicitlyToFalse() throws IOException {
+  @PlaywrightTest
+  void shouldNotFailWhenSourcesSetExplicitlyToFalse(BrowserContext context) throws IOException {
     Assumptions.assumeTrue(System.getenv("PLAYWRIGHT_JAVA_SRC") == null, "PLAYWRIGHT_JAVA_SRC must not be set for this test");
     context.tracing().start(new Tracing.StartOptions().setSources(false));
   }
 
-  @Test
-  void shouldRespectTracesDirAndName(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldRespectTracesDirAndName(BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     Path tracesDir = tempDir.resolve("trace-dir");
-    BrowserType.LaunchOptions options = createLaunchOptions();
+    BrowserType.LaunchOptions options = Env.launchOptions();
     options.setTracesDir(tracesDir);
     try (Browser browser = browserType.launch(options)) {
       BrowserContext context = browser.newContext();
@@ -217,7 +202,7 @@ void shouldRespectTracesDirAndName(@TempDir Path tempDir) throws Exception {
       assertTrue(Files.exists(tracesDir.resolve("name2.trace")));
       assertTrue(Files.exists(tracesDir.resolve("name2.network")));
       
-      TraceViewerPage.showTraceViewer(this.browserType, tempDir.resolve("trace1.zip"), traceViewer -> {
+      TraceViewerPage.showTraceViewer(browserType, tempDir.resolve("trace1.zip"), traceViewer -> {
         assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
           Pattern.compile("Navigate.*/one-style.html")
         });
@@ -226,7 +211,7 @@ void shouldRespectTracesDirAndName(@TempDir Path tempDir) throws Exception {
         assertThat(frame.locator("body")).hasText("hello, world!");
       });
       
-      TraceViewerPage.showTraceViewer(this.browserType, tempDir.resolve("trace2.zip"), traceViewer -> {
+      TraceViewerPage.showTraceViewer(browserType, tempDir.resolve("trace2.zip"), traceViewer -> {
         assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
           Pattern.compile("Navigate.*/har.html")
         });
@@ -237,8 +222,8 @@ void shouldRespectTracesDirAndName(@TempDir Path tempDir) throws Exception {
     }
   }
 
-  @Test
-  void canCallTracingGroupGroupEndAtAnyTimeAndAutoClose(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void canCallTracingGroupGroupEndAtAnyTimeAndAutoClose(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().group("ignored");
     context.tracing().groupEnd();
     context.tracing().group("ignored2");
@@ -254,13 +239,13 @@ void canCallTracingGroupGroupEndAtAnyTimeAndAutoClose(@TempDir Path tempDir) thr
     context.tracing().groupEnd();
     context.tracing().groupEnd();
 
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       assertThat(traceViewer.actionTitles()).containsText(new Pattern[] {Pattern.compile("actual"), Pattern.compile("Navigate.*/empty.html")});
     });
   }
 
-  @Test
-  void traceGroupGroupEnd(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void traceGroupGroupEnd(Page page, BrowserContext context, BrowserType browserType, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions());
     context.tracing().group("outer group");
     page.navigate("data:text/html,<!DOCTYPE html><body><div>Hello world</div></body>");
@@ -275,7 +260,7 @@ void traceGroupGroupEnd(@TempDir Path tempDir) throws Exception {
     Path traceFile1 = tempDir.resolve("trace1.zip");
     context.tracing().stop(new Tracing.StopOptions().setPath(traceFile1));
 
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       traceViewer.expandAction("inner group 1");
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("outer group"),
@@ -287,8 +272,8 @@ void traceGroupGroupEnd(@TempDir Path tempDir) throws Exception {
     });
   }
 
-  @Test
-  void shouldTraceVariousAPIs(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldTraceVariousAPIs(Page page, BrowserContext context, BrowserType browserType, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions());
 
     page.clock().install();
@@ -320,7 +305,7 @@ void shouldTraceVariousAPIs(@TempDir Path tempDir) throws Exception {
     Path traceFile1 = tempDir.resolve("trace1.zip");
     context.tracing().stop(new Tracing.StopOptions().setPath(traceFile1));
 
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Install clock"),
         Pattern.compile("Set content"),
@@ -348,8 +333,8 @@ void shouldTraceVariousAPIs(@TempDir Path tempDir) throws Exception {
     });
   }
 
-  @Test
-  public void shouldNotRecordNetworkActions(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  public void shouldNotRecordNetworkActions(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions());
 
     page.onRequest(request -> {
@@ -363,15 +348,15 @@ public void shouldNotRecordNetworkActions(@TempDir Path tempDir) throws Exceptio
     Path traceFile1 = tempDir.resolve("trace1.zip");
     context.tracing().stop(new Tracing.StopOptions().setPath(traceFile1));
 
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Navigate.*/empty.html")
       });
     });
   }
 
-  @Test
-  public void shouldShowWaitForLoadState(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  public void shouldShowWaitForLoadState(Page page, BrowserContext context, BrowserType browserType, Server server, @TempDir Path tempDir) throws Exception {
     // https://github.com/microsoft/playwright/issues/37297
 
     context.tracing().start(new Tracing.StartOptions());
@@ -382,7 +367,7 @@ public void shouldShowWaitForLoadState(@TempDir Path tempDir) throws Exception {
     Path traceFile1 = tempDir.resolve("trace1.zip");
     context.tracing().stop(new Tracing.StopOptions().setPath(traceFile1));
 
-    TraceViewerPage.showTraceViewer(this.browserType, traceFile1, traceViewer -> {
+    TraceViewerPage.showTraceViewer(browserType, traceFile1, traceViewer -> {
       assertThat(traceViewer.actionTitles()).hasText(new Pattern[] {
         Pattern.compile("Navigate.*/empty.html"),
         Pattern.compile("Wait for load state \"load\""),
@@ -390,8 +375,8 @@ public void shouldShowWaitForLoadState(@TempDir Path tempDir) throws Exception {
     });
   }
 
-  @Test
-  public void shouldRecordHarWithStartHarStopHar(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  public void shouldRecordHarWithStartHarStopHar(Page page, BrowserContext context, Server server, @TempDir Path tempDir) throws Exception {
     Path harPath = tempDir.resolve("tracing.har");
     context.tracing().startHar(harPath, new Tracing.StartHarOptions().setMode(com.microsoft.playwright.options.HarMode.MINIMAL));
     page.navigate(server.PREFIX + "/one-style.html");
@@ -401,8 +386,8 @@ public void shouldRecordHarWithStartHarStopHar(@TempDir Path tempDir) throws Exc
     assertTrue(content.contains("/one-style.html"), content);
   }
 
-  @Test
-  void shouldRecoverTracingAfterAFailedStop(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldRecoverTracingAfterAFailedStop(Page page, BrowserContext context, Server server, @TempDir Path tempDir) throws Exception {
     // https://github.com/microsoft/playwright/issues/42423
     context.tracing().start();
     // Saving fails: a parent of the destination is a file, not a directory.
@@ -424,22 +409,22 @@ void shouldRecoverTracingAfterAFailedStop(@TempDir Path tempDir) throws Exceptio
       && "click".equals(e.get("method").getAsString())));
   }
 
-  @Test
-  void shouldCollectActionScreenshots(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldCollectActionScreenshots(Page page, BrowserContext context, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions().setScreenSnapshots(true));
-    checkClickArtifacts(tempDir, "screenshot", "screenshots/", ".png",
+    checkClickArtifacts(page, context, server, tempDir, "screenshot", "screenshots/", ".png",
       content -> assertTrue(content.length > 0));
   }
 
-  @Test
-  void shouldCollectAriaSnapshots(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void shouldCollectAriaSnapshots(Page page, BrowserContext context, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start(new Tracing.StartOptions().setAriaSnapshots(true));
-    checkClickArtifacts(tempDir, "aria-snapshot", "aria/", ".json",
+    checkClickArtifacts(page, context, server, tempDir, "aria-snapshot", "aria/", ".json",
       content -> assertTrue(new String(content, StandardCharsets.UTF_8).contains("Click target")));
   }
 
   // Clicks a button while tracing and checks that before/action/after artifacts of the given type were recorded.
-  private void checkClickArtifacts(Path tempDir, String eventType, String dir, String extension, Consumer<byte[]> checkContent) throws Exception {
+  private void checkClickArtifacts(Page page, BrowserContext context, Server server, Path tempDir, String eventType, String dir, String extension, Consumer<byte[]> checkContent) throws Exception {
     page.navigate(server.PREFIX + "/input/button.html");
     page.click("button");
     Path trace = tempDir.resolve("trace.zip");
@@ -460,8 +445,8 @@ private void checkClickArtifacts(Path tempDir, String eventType, String dir, Str
     }
   }
 
-  @Test
-  void startShouldReturnADisposableThatDiscardsTheTrace(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void startShouldReturnADisposableThatDiscardsTheTrace(Page page, BrowserContext context, Server server, @TempDir Path tempDir) throws Exception {
     AutoCloseable disposable = context.tracing().start();
     page.navigate(server.EMPTY_PAGE);
     disposable.close();
@@ -470,8 +455,8 @@ void startShouldReturnADisposableThatDiscardsTheTrace(@TempDir Path tempDir) thr
     assertTrue(e.getMessage().contains("Must start tracing before stopping"), e.getMessage());
   }
 
-  @Test
-  void startChunkShouldReturnADisposableThatDiscardsTheChunk(@TempDir Path tempDir) throws Exception {
+  @PlaywrightTest
+  void startChunkShouldReturnADisposableThatDiscardsTheChunk(Page page, BrowserContext context, Server server, @TempDir Path tempDir) throws Exception {
     context.tracing().start();
     AutoCloseable disposable = context.tracing().startChunk();
     page.navigate(server.EMPTY_PAGE);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestTracingOverConnect.java b/playwright/src/test/java/com/microsoft/playwright/TestTracingOverConnect.java
index 361d53640..365810565 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestTracingOverConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestTracingOverConnect.java
@@ -16,9 +16,9 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import com.microsoft.playwright.fixtures.Scope;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
@@ -29,44 +29,33 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.microsoft.playwright.TestBrowserTypeConnect.launchBrowserServer;
 import static com.microsoft.playwright.Utils.mapOf;
 import static com.microsoft.playwright.Utils.parseZip;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestTracingOverConnect extends TestBase {
+public class TestTracingOverConnect {
   private static final String SRC_DIRS = System.getenv("PLAYWRIGHT_JAVA_SRC") == null ? "src/test/java" : System.getenv("PLAYWRIGHT_JAVA_SRC");
 
-  private TestBrowserTypeConnect.BrowserServer browserServer;
-
-  @Override
-  Playwright.CreateOptions playwrightOptions() {
+  @Fixture(scope = Scope.WORKER)
+  static Playwright.CreateOptions createOptions() {
     // Set the source root here rather than relying on the environment so that the test runs in the
     // regular test job too, not only in the one that passes PLAYWRIGHT_JAVA_SRC.
     return new Playwright.CreateOptions().setEnv(mapOf("PLAYWRIGHT_JAVA_SRC", SRC_DIRS));
   }
 
-  @Override
-  @BeforeAll
-  void launchBrowser() {
-    initBrowserType();
-    browserServer = launchBrowserServer(browserType);
-    browser = browserType.connect(browserServer.wsEndpoint);
+  @Fixture(scope = Scope.WORKER)
+  static BrowserServer browserServer(BrowserType browserType) {
+    return BrowserServer.launch(browserType);
   }
 
-  @Override
-  @AfterAll
-  void closeBrowser() {
-    super.closeBrowser();
-    if (browserServer != null) {
-      browserServer.process.destroyForcibly();
-      browserServer = null;
-    }
+  @Fixture(scope = Scope.WORKER)
+  static Browser browser(BrowserType browserType, BrowserServer browserServer) {
+    return browserType.connect(browserServer.wsEndpoint);
   }
 
-  @Test
-  void shouldRecordSourcesForBrowserFromConnect(@TempDir Path tmpDir) throws IOException {
+  @PlaywrightTest
+  void shouldRecordSourcesForBrowserFromConnect(Page page, BrowserContext context, Server server, @TempDir Path tmpDir) throws IOException {
     context.tracing().start(new Tracing.StartOptions().setSources(true));
     page.navigate(server.EMPTY_PAGE);
     page.setContent("<button>Click</button>");
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestUnresponsiveDriver.java b/playwright/src/test/java/com/microsoft/playwright/TestUnresponsiveDriver.java
index e211a648c..631baa211 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestUnresponsiveDriver.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestUnresponsiveDriver.java
@@ -16,7 +16,9 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
@@ -27,12 +29,13 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestUnresponsiveDriver {
-  @Test
+  @PlaywrightTest
   @DisabledOnOs(OS.WINDOWS)
   @EnabledForJreRange(min = JRE.JAVA_9)
-  void shouldThrowTimeoutErrorWhenDriverStopsResponding() throws Exception {
+  void shouldThrowTimeoutErrorWhenDriverStopsResponding(BrowserName browserName) throws Exception {
+    // A Playwright of its own: the test freezes the driver process.
     try (Playwright playwright = Playwright.create()) {
-      Browser browser = Utils.getBrowserTypeFromEnv(playwright).launch(TestBase.createLaunchOptions());
+      Browser browser = browserName.browserType(playwright).launch(Env.launchOptions());
       Page page = browser.newPage();
       long pid = driverPid(playwright);
       signal("STOP", pid);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestUnrouteBehavior.java b/playwright/src/test/java/com/microsoft/playwright/TestUnrouteBehavior.java
index 3c253f542..f432be589 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestUnrouteBehavior.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestUnrouteBehavior.java
@@ -16,13 +16,13 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestUnrouteBehavior extends TestBase {
-  @Test
-  void contextUnrouteAllRemovesAllHandlers() {
+public class TestUnrouteBehavior {
+  @PlaywrightTest
+  void contextUnrouteAllRemovesAllHandlers(Page page, BrowserContext context, Server server) {
     context.route("**/*", route -> {
       route.abort();
     });
@@ -33,8 +33,8 @@ void contextUnrouteAllRemovesAllHandlers() {
     page.navigate(server.EMPTY_PAGE);
   }
 
-  @Test
-  void pageUnrouteAllRemovesAllRoutes() {
+  @PlaywrightTest
+  void pageUnrouteAllRemovesAllRoutes(Page page, Server server) {
     page.route("**/*", route -> {
       route.abort();
     });
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestVideo.java b/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
index 97cff050e..4ef52594f 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestVideo.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.nio.file.Files;
@@ -25,9 +25,9 @@
 import static com.microsoft.playwright.Utils.relativePathOrSkipTest;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestVideo extends TestBase {
-  @Test
-  void shouldWorkWithRelativePathForRecordVideoDir(@TempDir Path tmpDir) {
+public class TestVideo {
+  @PlaywrightTest
+  void shouldWorkWithRelativePathForRecordVideoDir(Browser browser, @TempDir Path tmpDir) {
     Path relativeDir = relativePathOrSkipTest(tmpDir);
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setRecordVideoSize(320, 240).setRecordVideoDir(relativeDir));
@@ -38,8 +38,8 @@ void shouldWorkWithRelativePathForRecordVideoDir(@TempDir Path tmpDir) {
     assertTrue(Files.exists(videoPath), "videosPath = " + videoPath);
   }
 
-  @Test
-  void shouldRecordVideoWithTheRequestedFps(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldRecordVideoWithTheRequestedFps(Browser browser, @TempDir Path tmpDir) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions()
       .setRecordVideoDir(tmpDir).setRecordVideoFps(60));
     Page page = context.newPage();
@@ -50,15 +50,15 @@ void shouldRecordVideoWithTheRequestedFps(@TempDir Path tmpDir) {
     assertTrue(Files.exists(videoPath), "videosPath = " + videoPath);
   }
 
-  @Test
-  void shouldThrowOnInvalidFps(@TempDir Path tmpDir) {
+  @PlaywrightTest
+  void shouldThrowOnInvalidFps(Browser browser, @TempDir Path tmpDir) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> browser.newContext(new Browser.NewContextOptions()
       .setRecordVideoDir(tmpDir).setRecordVideoFps(0)));
     assertTrue(e.getMessage().contains("\"recordVideo.fps\" must be a positive number, got 0"), e.getMessage());
   }
 
-  @Test
-  void shouldThrowWhenFpsIsSetWithoutDir() {
+  @PlaywrightTest
+  void shouldThrowWhenFpsIsSetWithoutDir(Browser browser) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> browser.newContext(new Browser.NewContextOptions()
       .setRecordVideoFps(60)));
     assertTrue(e.getMessage().contains("recordVideoFps is set but recordVideoDir is null"), e.getMessage());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWaitForFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestWaitForFunction.java
index 9f93b6d14..aa1b82725 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWaitForFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWaitForFunction.java
@@ -16,7 +16,7 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -28,24 +28,24 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 
-public class TestWaitForFunction extends TestBase {
+public class TestWaitForFunction {
 
-  @Test
-  void shouldTimeout() {
+  @PlaywrightTest
+  void shouldTimeout(Page page) {
     Instant startTime = Instant.now();
     int timeout = 42;
     page.waitForTimeout(timeout);
     assertTrue(Duration.between(startTime, Instant.now()).toMillis() > timeout / 2);
   }
 
-  @Test
-  void shouldAcceptAString() {
+  @PlaywrightTest
+  void shouldAcceptAString(Page page) {
     page.evaluate("() => window['__FOO'] = 1");
     page.waitForFunction("window.__FOO === 1");
   }
 
-  @Test
-  void shouldWorkWhenResolvedRightBeforeExecutionContextDisposal() {
+  @PlaywrightTest
+  void shouldWorkWhenResolvedRightBeforeExecutionContextDisposal(Page page) {
     page.addInitScript("window['__RELOADED'] = true");
     page.waitForFunction("() => {\n" +
       "  if (!window['__RELOADED'])\n" +
@@ -55,8 +55,8 @@ void shouldWorkWhenResolvedRightBeforeExecutionContextDisposal() {
   }
 
 
-  @Test
-  void shouldPollOnInterval() {
+  @PlaywrightTest
+  void shouldPollOnInterval(Page page) {
     int polling = 100;
     JSHandle timeDelta = page.waitForFunction("() => {\n" +
       "  if (!window[\"__startTime\"]) {\n" +
@@ -69,8 +69,8 @@ void shouldPollOnInterval() {
     assertTrue(delta >= polling);
   }
 
-  @Test
-  void shouldAvoidSideEffectsAfterTimeout() {
+  @PlaywrightTest
+  void shouldAvoidSideEffectsAfterTimeout(Page page) {
     int[] counter = { 0 };
     page.onConsoleMessage(message -> ++counter[0]);
 
@@ -91,22 +91,22 @@ void shouldThrowOnPollingMutation() {
     // Not applicable to Java
   }
 
-  @Test
-  void shouldPollOnRaf() {
+  @PlaywrightTest
+  void shouldPollOnRaf(Page page) {
     page.evaluate("() => window['__FOO'] = 'hit'");
     page.waitForFunction("() => window['__FOO'] === 'hit'", null, new Page.WaitForFunctionOptions());
   }
 
-  @Test
-  void shouldFailWithPredicateThrowingOnFirstCall() {
+  @PlaywrightTest
+  void shouldFailWithPredicateThrowingOnFirstCall(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFunction("() => { throw new Error('oh my'); }");
     });
     assertTrue(e.getMessage().contains("oh my"));
   }
 
-  @Test
-  void shouldFailWithPredicateThrowingSometimes() {
+  @PlaywrightTest
+  void shouldFailWithPredicateThrowingSometimes(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFunction("() => {\n" +
         "  window['counter'] = (window['counter'] || 0) + 1;\n" +
@@ -118,16 +118,16 @@ void shouldFailWithPredicateThrowingSometimes() {
     assertTrue(e.getMessage().contains("Bad counter!"));
   }
 
-  @Test
-  void shouldFailWithReferenceErrorOnWrongPage() {
+  @PlaywrightTest
+  void shouldFailWithReferenceErrorOnWrongPage(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFunction("() => globalVar === 123");
     });
     assertTrue(e.getMessage().contains("globalVar"));
   }
 
-  @Test
-  void shouldWorkWithStrictCSPPolicy() {
+  @PlaywrightTest
+  void shouldWorkWithStrictCSPPolicy(Page page, Server server) {
     server.setCSP("/empty.html", "script-src " + server.PREFIX);
     page.navigate(server.EMPTY_PAGE);
 
@@ -139,42 +139,42 @@ void shouldThrowOnBadPollingValue() {
     // Not applicable in Java
   }
 
-  @Test
-  void shouldThrowNegativePollingInterval() {
+  @PlaywrightTest
+  void shouldThrowNegativePollingInterval(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFunction("() => !!document.body", null, new Page.WaitForFunctionOptions().setPollingInterval(-10));
     });
     assertTrue(e.getMessage().contains("Cannot poll with non-positive interval"));
   }
 
-  @Test
-  void shouldReturnTheSuccessValueAsAJSHandle() {
+  @PlaywrightTest
+  void shouldReturnTheSuccessValueAsAJSHandle(Page page) {
     assertEquals(5, (page.waitForFunction("5")).jsonValue());
   }
 
-  @Test
-  void shouldReturnTheWindowAsASuccessValue() {
+  @PlaywrightTest
+  void shouldReturnTheWindowAsASuccessValue(Page page) {
     assertNotNull(page.waitForFunction("() => window"));
   }
 
-  @Test
-  void shouldAcceptElementHandleArguments() {
+  @PlaywrightTest
+  void shouldAcceptElementHandleArguments(Page page) {
     page.setContent("<div></div>");
     ElementHandle div = page.querySelector("div");
     page.evaluate("element => element.remove()", div);
     page.waitForFunction("element => !element.parentElement", div);
   }
 
-  @Test
-  void shouldRespectTimeout() {
+  @PlaywrightTest
+  void shouldRespectTimeout(Page page) {
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFunction("false", null, new Page.WaitForFunctionOptions().setTimeout(10));
     });
     assertTrue(e.getMessage().contains("Timeout 10ms exceeded"));
   }
 
-  @Test
-  void shouldRespectDefaultTimeout() {
+  @PlaywrightTest
+  void shouldRespectDefaultTimeout(Page page) {
     page.setDefaultTimeout(1);
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       page.waitForFunction("false");
@@ -182,16 +182,16 @@ void shouldRespectDefaultTimeout() {
     assertTrue(e.getMessage().contains("Timeout 1ms exceeded"));
   }
 
-  @Test
-  void shouldDisableTimeoutWhenItsSetTo0() {
+  @PlaywrightTest
+  void shouldDisableTimeoutWhenItsSetTo0(Page page) {
     page.waitForFunction("() => {\n" +
       "  window['__counter'] = (window['__counter'] || 0) + 1;\n" +
       "  return window['__counter'] > 10;\n" +
       "}", null, new Page.WaitForFunctionOptions().setTimeout(0).setPollingInterval(10));
   }
 
-  @Test
-  void shouldSurviveCrossProcessNavigation() {
+  @PlaywrightTest
+  void shouldSurviveCrossProcessNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.reload();
     page.navigate(server.CROSS_PROCESS_PREFIX + "/grid.html");
@@ -200,54 +200,54 @@ void shouldSurviveCrossProcessNavigation() {
     assertNotNull(result);
   }
 
-  @Test
-  void shouldSurviveNavigations() {
+  @PlaywrightTest
+  void shouldSurviveNavigations(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.navigate(server.PREFIX + "/consolelog.html");
     page.evaluate("() => window['__done'] = true");
     page.waitForFunction("() => window['__done']");
   }
 
-  @Test
-  void shouldWorkWithMultilineBody() {
+  @PlaywrightTest
+  void shouldWorkWithMultilineBody(Page page) {
     JSHandle result = page.waitForFunction("\n  () => true\n");
     assertEquals(true, result.jsonValue());
   }
 
 
-  @Test
-  void shouldWaitForPredicateWithArguments() {
+  @PlaywrightTest
+  void shouldWaitForPredicateWithArguments(Page page) {
     page.waitForFunction("({arg1, arg2}) => arg1 + arg2 === 3", mapOf("arg1", 1, "arg2", 2));
   }
 
-    @Test
-    void shouldNotBeCalledAfterFinishingSuccessfully() {
-      page.navigate(server.EMPTY_PAGE);
-      List<String> messages = new ArrayList<>();
-      page.onConsoleMessage(msg -> {
-        if (msg.text().startsWith("waitForFunction")) {
-          messages.add(msg.text());
-        }
-      });
-      page.waitForFunction("() => {\n" +
-        "  console.log('waitForFunction1');\n" +
-        "  return true;\n" +
-        "}");
-      page.reload();
-      page.waitForFunction("() => {\n" +
-        "  console.log('waitForFunction2');\n" +
-        "  return true;\n" +
-        "}");
-      page.reload();
-      page.waitForFunction("() => {\n" +
-        "  console.log('waitForFunction3');\n" +
-        "  return true;\n" +
-        "}");
-      assertEquals(asList("waitForFunction1", "waitForFunction2", "waitForFunction3"), messages);
-    }
+  @PlaywrightTest
+  void shouldNotBeCalledAfterFinishingSuccessfully(Page page, Server server) {
+    page.navigate(server.EMPTY_PAGE);
+    List<String> messages = new ArrayList<>();
+    page.onConsoleMessage(msg -> {
+      if (msg.text().startsWith("waitForFunction")) {
+        messages.add(msg.text());
+      }
+    });
+    page.waitForFunction("() => {\n" +
+      "  console.log('waitForFunction1');\n" +
+      "  return true;\n" +
+      "}");
+    page.reload();
+    page.waitForFunction("() => {\n" +
+      "  console.log('waitForFunction2');\n" +
+      "  return true;\n" +
+      "}");
+    page.reload();
+    page.waitForFunction("() => {\n" +
+      "  console.log('waitForFunction3');\n" +
+      "  return true;\n" +
+      "}");
+    assertEquals(asList("waitForFunction1", "waitForFunction2", "waitForFunction3"), messages);
+  }
 
-  @Test
-  void shouldNotBeCalledAfterFinishingUnsuccessfully() {
+  @PlaywrightTest
+  void shouldNotBeCalledAfterFinishingUnsuccessfully(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     List<String> messages = new ArrayList<>();
     page.onConsoleMessage(msg -> {
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWebMCP.java b/playwright/src/test/java/com/microsoft/playwright/TestWebMCP.java
index 6fd33967f..6fcdec8b4 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWebMCP.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWebMCP.java
@@ -16,10 +16,13 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
+import com.microsoft.playwright.fixtures.Scope;
 import com.microsoft.playwright.options.WebMCPTool;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.io.OutputStreamWriter;
 import java.io.Writer;
@@ -28,12 +31,14 @@
 
 import static com.microsoft.playwright.Utils.assertJsonEquals;
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
 
-@DisabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="WebKit does not implement WebMCP")
-public class TestWebMCP extends TestBase {
+@DisabledOnBrowser(value = WEBKIT, reason = "WebKit does not implement WebMCP")
+public class TestWebMCP {
   private static final String ADD_TOOL = "modelContext.registerTool({\n" +
     "  name: 'add',\n" +
     "  description: 'Adds two numbers',\n" +
@@ -42,18 +47,16 @@ public class TestWebMCP extends TestBase {
     "  async execute(input) { return { content: [{ type: 'text', text: String(input.a + input.b) }] }; },\n" +
     "});\n";
 
-  @Override
-  @BeforeAll
-  void launchBrowser() {
-    BrowserType.LaunchOptions options = createLaunchOptions();
-    if (isFirefox()) {
+  @Fixture(scope = Scope.WORKER)
+  static BrowserType.LaunchOptions launchOptions(BrowserType.LaunchOptions options, BrowserName browserName) {
+    if (browserName == FIREFOX) {
       options.setFirefoxUserPrefs(mapOf(
         "dom.modelcontext.enabled", true,
         "dom.modelcontext.testing.enabled", true));
     } else {
       options.setArgs(singletonList("--enable-features=WebMCP"));
     }
-    launchBrowser(options);
+    return options;
   }
 
   private static String registerScript(String tools) {
@@ -63,7 +66,7 @@ private static String registerScript(String tools) {
       "</script>";
   }
 
-  private void serve(String path, String body) {
+  private void serve(Server server, String path, String body) {
     server.setRoute(path, exchange -> {
       exchange.getResponseHeaders().add("Content-Type", "text/html");
       exchange.sendResponseHeaders(200, 0);
@@ -73,9 +76,9 @@ private void serve(String path, String body) {
     });
   }
 
-  @Test
-  void shouldListToolsRegisteredByThePage() {
-    serve("/", registerScript(ADD_TOOL +
+  @PlaywrightTest
+  void shouldListToolsRegisteredByThePage(Page page, Server server) {
+    serve(server, "/", registerScript(ADD_TOOL +
       "modelContext.registerTool({\n" +
       "  name: 'noop',\n" +
       "  description: 'Does nothing',\n" +
@@ -98,24 +101,24 @@ void shouldListToolsRegisteredByThePage() {
     assertTrue(tools.get(0).annotations.readOnly);
   }
 
-  @Test
-  void shouldReportNoToolsWhenThePageRegistersNone() {
+  @PlaywrightTest
+  void shouldReportNoToolsWhenThePageRegistersNone(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(0, page.webmcp().tools().size());
   }
 
-  @Test
-  void shouldCallATool() {
-    serve("/", registerScript(ADD_TOOL));
+  @PlaywrightTest
+  void shouldCallATool(Page page, Server server) {
+    serve(server, "/", registerScript(ADD_TOOL));
     page.navigate(server.PREFIX + "/");
 
     Object result = page.webmcp().callTool("add", mapOf("a", 2, "b", 40));
     assertEquals(mapOf("content", asList(mapOf("type", "text", "text", "42"))), result);
   }
 
-  @Test
-  void shouldReturnIsErrorResultsAsIs() {
-    serve("/", registerScript(
+  @PlaywrightTest
+  void shouldReturnIsErrorResultsAsIs(Page page, Server server) {
+    serve(server, "/", registerScript(
       "modelContext.registerTool({\n" +
       "  name: 'broken',\n" +
       "  description: 'Always fails',\n" +
@@ -127,9 +130,9 @@ void shouldReturnIsErrorResultsAsIs() {
     assertEquals(mapOf("content", asList(mapOf("type", "text", "text", "nope")), "isError", true), result);
   }
 
-  @Test
-  void shouldThrowForAnUnknownTool() {
-    serve("/", registerScript(ADD_TOOL));
+  @PlaywrightTest
+  void shouldThrowForAnUnknownTool(Page page, Server server) {
+    serve(server, "/", registerScript(ADD_TOOL));
     page.navigate(server.PREFIX + "/");
 
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.webmcp().callTool("missing"));
@@ -137,9 +140,9 @@ void shouldThrowForAnUnknownTool() {
     assertTrue(e.getMessage().contains("Available tools: add"), e.getMessage());
   }
 
-  @Test
-  void shouldTimeOutWhenTheToolDoesNotSettle() {
-    serve("/", registerScript(
+  @PlaywrightTest
+  void shouldTimeOutWhenTheToolDoesNotSettle(Page page, Server server) {
+    serve(server, "/", registerScript(
       "modelContext.registerTool({\n" +
       "  name: 'stuck',\n" +
       "  description: 'Never resolves',\n" +
@@ -151,11 +154,11 @@ void shouldTimeOutWhenTheToolDoesNotSettle() {
     assertTrue(e.getMessage().contains("Timeout 500ms exceeded"), e.getMessage());
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="Firefox does not support registering WebMCP tools in iframes yet")
-  void shouldScopeToolsToTheirFrame() {
-    serve("/", registerScript(ADD_TOOL) + "<iframe src='/frame.html'></iframe>");
-    serve("/frame.html", registerScript(
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "Firefox does not support registering WebMCP tools in iframes yet")
+  void shouldScopeToolsToTheirFrame(Page page, Server server) {
+    serve(server, "/", registerScript(ADD_TOOL) + "<iframe src='/frame.html'></iframe>");
+    serve(server, "/frame.html", registerScript(
       "modelContext.registerTool({\n" +
       "  name: 'subscribe',\n" +
       "  description: 'Subscribes to the newsletter',\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java b/playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java
index 08dcd9c0e..fcdc82035 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWebSocket.java
@@ -16,9 +16,9 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Fixture;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -27,24 +27,18 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.microsoft.playwright.Utils.waitForCondition;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestWebSocket extends TestBase {
-  private static WebSocketServerImpl webSocketServer;
-
-  @BeforeAll
-  static void startWebSockerServer() throws InterruptedException {
-    webSocketServer = WebSocketServerImpl.create();
-  }
-
-  @AfterAll
-  static void stopWebSockerServer() throws IOException, InterruptedException {
-    webSocketServer.stop();
+public class TestWebSocket {
+  @Fixture
+  WebSocketServerImpl webSocketServer() throws InterruptedException {
+    return WebSocketServerImpl.create();
   }
 
-
-  private void waitForCondition(boolean[] condition) {
+  private void waitForCondition(Page page, boolean[] condition) {
     assertEquals(1, condition.length);
     Instant start = Instant.now();
     while (!condition[0]) {
@@ -53,8 +47,8 @@ private void waitForCondition(boolean[] condition) {
     }
   }
 
-  @Test
-  void shouldWork() {
+  @PlaywrightTest
+  void shouldWork(Page page, WebSocketServerImpl webSocketServer) {
     Object value = page.evaluate("port => {\n" +
       "  let cb;\n" +
       "  const result = new Promise(f => cb = f);\n" +
@@ -65,8 +59,8 @@ void shouldWork() {
     assertEquals("incoming", value);
   }
 
-  @Test
-  void shouldEmitCloseEvents() {
+  @PlaywrightTest
+  void shouldEmitCloseEvents(Page page, WebSocketServerImpl webSocketServer) {
     boolean[] socketClosed = {false};
     List<String> log = new ArrayList<>();
     com.microsoft.playwright.WebSocket[] webSocket = {null};
@@ -82,13 +76,13 @@ void shouldEmitCloseEvents() {
       "  const ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
       "  ws.addEventListener('open', () => ws.close());\n" +
       "}", webSocketServer.getPort());
-    waitForCondition(socketClosed);
+    waitForCondition(page, socketClosed);
     assertEquals(asList("open<ws://localhost:" + webSocketServer.getPort() + "/ws>", "close"), log);
     assertTrue(webSocket[0].isClosed());
   }
 
-  @Test
-  void shouldEmitFrameEvents() {
+  @PlaywrightTest
+  void shouldEmitFrameEvents(Page page, WebSocketServerImpl webSocketServer) {
     boolean[] socketClosed = {false};
     List<String> log = new ArrayList<>();
     page.onWebSocket(ws -> {
@@ -102,15 +96,15 @@ void shouldEmitFrameEvents() {
       "    ws.addEventListener('open', () => ws.send('outgoing'));\n" +
       "    ws.addEventListener('message', () => { ws.close(); });\n" +
       "  }", webSocketServer.getPort());
-    waitForCondition(socketClosed);
+    waitForCondition(page, socketClosed);
     assertEquals("open", log.get(0), "Events: " + log);
     assertEquals("close", log.get(3), "Events: " + log);
     log.sort(String::compareTo);
     assertEquals(asList("close", "open", "received<incoming>", "sent<outgoing>"), log);
   }
 
-  @Test
-  void shouldEmitBinaryFrameEvents() {
+  @PlaywrightTest
+  void shouldEmitBinaryFrameEvents(Page page, WebSocketServerImpl webSocketServer) {
     boolean[] socketClosed = {false};
     List<WebSocketFrame> sent = new ArrayList<>();
     page.onWebSocket(ws -> {
@@ -128,15 +122,15 @@ void shouldEmitBinaryFrameEvents() {
       "    ws.close();\n" +
       "  });\n" +
       "}", webSocketServer.getPort());
-    waitForCondition(socketClosed);
+    waitForCondition(page, socketClosed);
     assertEquals("text", sent.get(0).text());
     for (int i = 0; i < 5; ++i) {
       assertEquals(i, sent.get(1).binary()[i]);
     }
   }
 
-  @Test
-  void shouldEmitError() {
+  @PlaywrightTest
+  void shouldEmitError(Page page, Server server, BrowserName browserName) {
     boolean[] socketError = {false};
     String[] error = {null};
     page.onWebSocket(ws -> {
@@ -152,16 +146,16 @@ public void accept(String e) {
     page.evaluate("port => {\n" +
       "  new WebSocket('ws://localhost:' + port + '/bogus-ws');\n" +
       "}", server.PORT);
-    waitForCondition(socketError);
-    if (isFirefox()) {
+    waitForCondition(page, socketError);
+    if (browserName == FIREFOX) {
       assertEquals("CLOSE_ABNORMAL", error[0]);
     } else {
       assertTrue(error[0].contains("404"), error[0]);
     }
   }
 
-  @Test
-  void shouldNotHaveStrayErrorEvents() {
+  @PlaywrightTest
+  void shouldNotHaveStrayErrorEvents(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
         page.evaluate("port => {\n" +
           "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -174,8 +168,8 @@ void shouldNotHaveStrayErrorEvents() {
     assertFalse(error[0]);
   }
 
-  @Test
-  void shouldRejectFutureEventOnSocketClose() {
+  @PlaywrightTest
+  void shouldRejectFutureEventOnSocketClose(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
       page.evaluate("port => {\n" +
         "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -188,8 +182,8 @@ void shouldRejectFutureEventOnSocketClose() {
     assertTrue(e.getMessage().matches("Socket closed|Socket error"), e.getMessage());
   }
 
-  @Test
-  void shouldRejectFutureEventOnPageClose() {
+  @PlaywrightTest
+  void shouldRejectFutureEventOnPageClose(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
       page.evaluate("port => {\n" +
         "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -202,8 +196,8 @@ void shouldRejectFutureEventOnPageClose() {
     assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
   }
 
-  @Test
-  void shouldCallFrameReceivedPredicate() {
+  @PlaywrightTest
+  void shouldCallFrameReceivedPredicate(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
       page.evaluate("port => {\n" +
         "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -223,8 +217,8 @@ void shouldCallFrameReceivedPredicate() {
     assertEquals("incoming", frame.text());
   }
 
-  @Test
-  void shouldCallFrameSentPredicate() {
+  @PlaywrightTest
+  void shouldCallFrameSentPredicate(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
       page.evaluate("port => {\n" +
         "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -245,8 +239,8 @@ void shouldCallFrameSentPredicate() {
     assertEquals("outgoing", frame.text());
   }
 
-  @Test
-  void shouldRespectFrameReceivedTimeout() {
+  @PlaywrightTest
+  void shouldRespectFrameReceivedTimeout(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
       page.evaluate("port => {\n" +
         "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
@@ -261,8 +255,8 @@ void shouldRespectFrameReceivedTimeout() {
     assertTrue(e.getMessage().contains("Timeout"), e.getMessage());
   }
 
-  @Test
-  void shouldRespectFrameSentTimeout() {
+  @PlaywrightTest
+  void shouldRespectFrameSentTimeout(Page page, WebSocketServerImpl webSocketServer) {
     com.microsoft.playwright.WebSocket ws = page.waitForWebSocket(() -> {
       page.evaluate("port => {\n" +
         "  window.ws = new WebSocket('ws://localhost:' + port + '/ws');\n" +
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java b/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java
index 98d1c6e17..b29c4713a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWebStorage.java
@@ -16,8 +16,8 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import com.microsoft.playwright.options.WebStorageItem;
-import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +26,7 @@
 import static com.microsoft.playwright.Utils.mapOf;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestWebStorage extends TestBase {
+public class TestWebStorage {
   private static Map<String, String> asMap(List<WebStorageItem> items) {
     Map<String, String> map = new HashMap<>();
     for (WebStorageItem item : items) {
@@ -35,20 +35,20 @@ private static Map<String, String> asMap(List<WebStorageItem> items) {
     return map;
   }
 
-  @Test
-  void localStorageItemsReturnsEmptyListOnFreshOrigin() {
+  @PlaywrightTest
+  void localStorageItemsReturnsEmptyListOnFreshOrigin(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(0, page.localStorage().items().size());
   }
 
-  @Test
-  void localStorageGetItemReturnsNullForMissingKey() {
+  @PlaywrightTest
+  void localStorageGetItemReturnsNullForMissingKey(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertNull(page.localStorage().getItem("absent"));
   }
 
-  @Test
-  void localStorageSetItemPersistsAndSurfacesInItemsAndGetItem() {
+  @PlaywrightTest
+  void localStorageSetItemPersistsAndSurfacesInItemsAndGetItem(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.localStorage().setItem("alpha", "1");
     page.localStorage().setItem("beta", "2");
@@ -58,16 +58,16 @@ void localStorageSetItemPersistsAndSurfacesInItemsAndGetItem() {
     assertEquals("1", page.evaluate("() => localStorage.getItem('alpha')"));
   }
 
-  @Test
-  void localStorageSetItemOverwritesExistingValue() {
+  @PlaywrightTest
+  void localStorageSetItemOverwritesExistingValue(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.localStorage().setItem("k", "first");
     page.localStorage().setItem("k", "second");
     assertEquals("second", page.localStorage().getItem("k"));
   }
 
-  @Test
-  void localStorageRemoveItemRemovesSingleItem() {
+  @PlaywrightTest
+  void localStorageRemoveItemRemovesSingleItem(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.localStorage().setItem("a", "1");
     page.localStorage().setItem("b", "2");
@@ -76,8 +76,8 @@ void localStorageRemoveItemRemovesSingleItem() {
     assertEquals(mapOf("b", "2"), asMap(page.localStorage().items()));
   }
 
-  @Test
-  void localStorageClearEmptiesStorage() {
+  @PlaywrightTest
+  void localStorageClearEmptiesStorage(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.localStorage().setItem("a", "1");
     page.localStorage().setItem("b", "2");
@@ -86,8 +86,8 @@ void localStorageClearEmptiesStorage() {
     assertEquals(0, page.localStorage().items().size());
   }
 
-  @Test
-  void sessionStorageRoundTrip() {
+  @PlaywrightTest
+  void sessionStorageRoundTrip(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     assertEquals(0, page.sessionStorage().items().size());
 
@@ -103,8 +103,8 @@ void sessionStorageRoundTrip() {
     assertEquals(0, page.sessionStorage().items().size());
   }
 
-  @Test
-  void localStorageAndSessionStorageAreIndependent() {
+  @PlaywrightTest
+  void localStorageAndSessionStorageAreIndependent(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     page.localStorage().setItem("shared", "local");
     page.sessionStorage().setItem("shared", "session");
@@ -117,8 +117,8 @@ void localStorageAndSessionStorageAreIndependent() {
     assertEquals("session", page.sessionStorage().getItem("shared"));
   }
 
-  @Test
-  void storageMethodsAreScopedToTheCurrentOrigin() {
+  @PlaywrightTest
+  void storageMethodsAreScopedToTheCurrentOrigin(Page page, Server server) {
     page.navigate(server.PREFIX + "/empty.html");
     page.localStorage().setItem("k", "origin-1");
 
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWheel.java b/playwright/src/test/java/com/microsoft/playwright/TestWheel.java
index bfe83f1e9..46ef2017b 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWheel.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWheel.java
@@ -16,22 +16,25 @@
 
 package com.microsoft.playwright;
 
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 
 import java.util.Map;
 
 import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.Env.isMac;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestWheel extends TestBase {
-  private void expectEvent(Map<String, Object> expected) {
+public class TestWheel {
+  private void expectEvent(Page page, BrowserName browserName, Map<String, Object> expected) {
     // Chromium reports deltaX/deltaY scaled by host device scale factor.
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1324819
     // https://github.com/microsoft/playwright/issues/7362
     // Different bots have different scale factors (usually 1 or 2), so we just ignore the values
     // instead of guessing the host scale factor.
     // This first appeared in Chromium 102.
-    boolean ignoreDelta = isChromium() && isMac;
+    boolean ignoreDelta = browserName == CHROMIUM && isMac;
     Map<String, Object> received = (Map<String, Object>) page.evaluate("window.lastEvent");
     if (ignoreDelta) {
       expected.remove("deltaX");
@@ -42,8 +45,8 @@ private void expectEvent(Map<String, Object> expected) {
     assertEquals(expected, received);
   }
 
-  @Test
-  void shouldDispatchWheelEvents() {
+  @PlaywrightTest
+  void shouldDispatchWheelEvents(Page page, BrowserName browserName) {
     page.setContent("<div style='width: 5000px; height: 5000px;'></div>");
     page.mouse().move(50, 60);
     listenForWheelEvents(page, "div");
@@ -60,11 +63,11 @@ void shouldDispatchWheelEvents() {
       "altKey", false,
       "metaKey", false);
     page.waitForFunction("window.scrollY === 100");
-    expectEvent(expected);
+    expectEvent(page, browserName, expected);
   }
 
-  @Test
-  void shouldScrollWhenNobodyIsListening() {
+  @PlaywrightTest
+  void shouldScrollWhenNobodyIsListening(Page page, Server server) {
     page.navigate(server.PREFIX + "/input/scrollable.html");
     page.mouse().move(50, 60);
     page.mouse().wheel(0, 100);
@@ -72,8 +75,8 @@ void shouldScrollWhenNobodyIsListening() {
   }
 
 
-  @Test
-  void shouldSetTheModifiers() {
+  @PlaywrightTest
+  void shouldSetTheModifiers(Page page, BrowserName browserName) {
     page.setContent("<div style='width: 5000px; height: 5000px;'></div>");
     page.mouse().move(50, 60);
     listenForWheelEvents(page, "div");
@@ -89,11 +92,11 @@ void shouldSetTheModifiers() {
       "shiftKey", true,
       "altKey", false,
       "metaKey", false);
-    expectEvent(expected);
+    expectEvent(page, browserName, expected);
   }
 
-  @Test
-  void shouldScrollHorizontally() {
+  @PlaywrightTest
+  void shouldScrollHorizontally(Page page, BrowserName browserName) {
     page.setContent("<div style='width: 5000px; height: 5000px;'></div>");
     page.mouse().move(50, 60);
     listenForWheelEvents(page, "div");
@@ -109,11 +112,11 @@ void shouldScrollHorizontally() {
       "altKey", false,
       "metaKey", false);
     page.waitForFunction("window.scrollX === 100");
-    expectEvent(expected);
+    expectEvent(page, browserName, expected);
   }
 
-  @Test
-  void shouldWorkWhenTheEventIsCanceled() {
+  @PlaywrightTest
+  void shouldWorkWhenTheEventIsCanceled(Page page, BrowserName browserName) {
     page.setContent("<div style='width: 5000px; height: 5000px;'></div>");
     page.mouse().move(50, 60);
     listenForWheelEvents(page, "div");
@@ -133,7 +136,7 @@ void shouldWorkWhenTheEventIsCanceled() {
       "shiftKey", false,
       "altKey", false,
       "metaKey", false);
-    expectEvent(expected);
+    expectEvent(page, browserName, expected);
     // ensure that it did not.
     assertEquals(0, page.evaluate("window.scrollY"));
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java b/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java
index 379b7d116..02a9ec88a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestWorkers.java
@@ -16,27 +16,31 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.DisabledOnBrowser;
+import com.microsoft.playwright.fixtures.EnabledOnBrowser;
+import com.microsoft.playwright.fixtures.PlaywrightTest;
 import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.condition.EnabledIf;
 
 import java.time.Duration;
 import java.time.Instant;
 
 import static com.microsoft.playwright.Utils.attachFrame;
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestWorkers extends TestBase {
+public class TestWorkers {
 
-  private int browserMajorVersion() {
+  private int browserMajorVersion(Browser browser) {
     String version = browser.version();
     return Integer.parseInt(version.split("\\.")[0]);
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Started failing since last driver roll, flaky upstream")
-  void pageWorkers() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, reason = "Started failing since last driver roll, flaky upstream")
+  void pageWorkers(Page page, Server server) {
     Worker worker = page.waitForWorker(() -> page.navigate(server.PREFIX + "/worker/worker.html"));
     assertTrue(worker.url().contains("worker.js"));
     assertEquals("worker function result", worker.evaluate("() => self['workerFunction']()"));
@@ -44,8 +48,8 @@ void pageWorkers() {
     assertEquals(0, page.workers().size());
   }
 
-  @Test
-  void shouldEmitCreatedAndDestroyedEvents() {
+  @PlaywrightTest
+  void shouldEmitCreatedAndDestroyedEvents(Page page) {
     JSHandle[] workerObj = {null};
     Worker worker = page.waitForWorker(() -> {
       workerObj[0] = page.evaluateHandle(
@@ -62,18 +66,18 @@ void shouldEmitCreatedAndDestroyedEvents() {
 
   }
 
-  @Test
-  void shouldReportConsoleLogs() {
+  @PlaywrightTest
+  void shouldReportConsoleLogs(Page page) {
     ConsoleMessage message = page.waitForConsoleMessage(() -> page.evaluate(
       "() => new Worker(URL.createObjectURL(new Blob(['console.log(1)'], {type: 'application/javascript'})))"));
     assertEquals("1", message.text());
   }
 
-  @Test
-  void shouldHaveJSHandlesForConsoleLogs() {
+  @PlaywrightTest
+  void shouldHaveJSHandlesForConsoleLogs(Page page, BrowserName browserName) {
     ConsoleMessage log = page.waitForConsoleMessage(() -> page.evaluate(
       "() => new Worker(URL.createObjectURL(new Blob(['console.log(1,2,3,this)'], {type: 'application/javascript'})))"));
-    if (isFirefox()) {
+    if (browserName == FIREFOX) {
       assertEquals("1 2 3 JSHandle@object", log.text());
     } else {
       assertEquals("1 2 3 DedicatedWorkerGlobalScope", log.text());
@@ -82,15 +86,15 @@ void shouldHaveJSHandlesForConsoleLogs() {
     assertEquals("null", (log.args().get(3).getProperty("origin")).jsonValue());
   }
 
-  @Test
-  void shouldEvaluate() {
+  @PlaywrightTest
+  void shouldEvaluate(Page page) {
     Worker worker = page.waitForWorker(() -> page.evaluate(
       "() => new Worker(URL.createObjectURL(new Blob(['console.log(1)'], {type: 'application/javascript'})))"));
     assertEquals(2, worker.evaluate("1+1"));
   }
 
-  @Test
-  void shouldReportErrors() {
+  @PlaywrightTest
+  void shouldReportErrors(Page page) {
     String[] errorLog = {null};
     page.onPageError(e -> errorLog[0] = e);
     page.evaluate("() => new Worker(URL.createObjectURL(new Blob([`\n" +
@@ -108,9 +112,9 @@ void shouldReportErrors() {
     assertTrue(errorLog[0].contains("this is my error"));
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="flaky upstream")
-  void shouldClearUponNavigation() {
+  @PlaywrightTest
+  @DisabledOnBrowser(value = FIREFOX, reason = "flaky upstream")
+  void shouldClearUponNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Worker worker = page.waitForWorker(() -> page.evaluate(
       "() => new Worker(URL.createObjectURL(new Blob(['console.log(1)'], {type: 'application/javascript'})))"));
@@ -120,8 +124,8 @@ void shouldClearUponNavigation() {
     assertEquals(0, page.workers().size());
   }
 
-  @Test
-  void shouldClearUponCrossProcessNavigation() {
+  @PlaywrightTest
+  void shouldClearUponCrossProcessNavigation(Page page, Server server) {
     page.navigate(server.EMPTY_PAGE);
     Worker worker = page.waitForWorker(() -> page.evaluate(
       "() => new Worker(URL.createObjectURL(new Blob(['console.log(1)'], {type: 'application/javascript'})))"));
@@ -133,9 +137,9 @@ void shouldClearUponCrossProcessNavigation() {
     assertEquals(0, page.workers().size());
   }
 
-  @Test
-  @EnabledIf(value="com.microsoft.playwright.TestBase#isWebKit", disabledReason="fixme")
-  void shouldAttributeNetworkActivityForWorkerInsideIframeToTheIframe() {
+  @PlaywrightTest
+  @EnabledOnBrowser(value = WEBKIT, reason = "fixme")
+  void shouldAttributeNetworkActivityForWorkerInsideIframeToTheIframe(Page page, Server server) {
     page.navigate(server.PREFIX + "/empty.html");
     Frame[] frame = {null};
     Worker worker = page.waitForWorker(() -> {
@@ -150,10 +154,10 @@ void shouldAttributeNetworkActivityForWorkerInsideIframeToTheIframe() {
     assertEquals(frame[0], request.frame());
   }
 
-  @Test
-  @DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Started failing since last driver roll, flaky upstream")
-  void shouldReportNetworkActivity() {
-    Assumptions.assumeFalse(isFirefox() && browserMajorVersion() < 114);
+  @PlaywrightTest
+  @DisabledOnBrowser(value = CHROMIUM, reason = "Started failing since last driver roll, flaky upstream")
+  void shouldReportNetworkActivity(Page page, Browser browser, Server server, BrowserName browserName) {
+    Assumptions.assumeFalse(browserName == FIREFOX && browserMajorVersion(browser) < 114);
     Worker worker = page.waitForWorker(() -> page.navigate(server.PREFIX + "/worker/worker.html"));
     String url = server.PREFIX + "/one-style.css";
     Request[] request = {null};
@@ -167,9 +171,9 @@ void shouldReportNetworkActivity() {
     assertTrue(response.ok());
   }
 
-  @Test
-  void shouldReportNetworkActivityOnWorkerCreation() {
-    Assumptions.assumeFalse(isFirefox() && browserMajorVersion() < 114);
+  @PlaywrightTest
+  void shouldReportNetworkActivityOnWorkerCreation(Page page, Browser browser, Server server, BrowserName browserName) {
+    Assumptions.assumeFalse(browserName == FIREFOX && browserMajorVersion(browser) < 114);
     // Chromium needs waitForDebugger enabled for this one.
     page.navigate(server.EMPTY_PAGE);
     String url = server.PREFIX + "/one-style.css";
@@ -186,8 +190,8 @@ void shouldReportNetworkActivityOnWorkerCreation() {
     assertTrue(response.ok());
   }
 
-  @Test
-  void shouldFormatNumberUsingContextLocale() {
+  @PlaywrightTest
+  void shouldFormatNumberUsingContextLocale(Browser browser, Server server) {
     BrowserContext context = browser.newContext(new Browser.NewContextOptions().setLocale("ru-RU"));
     Page page = context.newPage();
     page.navigate(server.EMPTY_PAGE);
@@ -197,8 +201,8 @@ void shouldFormatNumberUsingContextLocale() {
     context.close();
   }
 
-  @Test
-  void shouldReportConsoleEventOnTheWorker() {
+  @PlaywrightTest
+  void shouldReportConsoleEventOnTheWorker(Page page) {
     Worker worker = page.waitForWorker(() -> page.evaluate(
       "() => { window.worker = new Worker(URL.createObjectURL(new Blob(['42'], {type: 'application/javascript'}))); }"
     ));
diff --git a/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java b/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java
index 21a94d64f..5e3fed3fd 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TraceViewerPage.java
@@ -20,6 +20,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import com.microsoft.playwright.fixtures.Env;
 import com.microsoft.playwright.impl.driver.Driver;
 import com.microsoft.playwright.options.AriaRole;
 
@@ -100,7 +101,7 @@ static void showTraceViewer(BrowserType browserType, Path tracePath, TraceViewer
       exchange.getResponseBody().close();
     });
 
-    try (Browser browser = browserType.launch(TestBase.createLaunchOptions());
+    try (Browser browser = browserType.launch(Env.launchOptions());
          BrowserContext context = browser.newContext()) {
       Page page = context.newPage();
       page.navigate(traceServer.PREFIX + "/index.html?trace=" + traceServer.PREFIX + "/trace.zip");
diff --git a/playwright/src/test/java/com/microsoft/playwright/Utils.java b/playwright/src/test/java/com/microsoft/playwright/Utils.java
index 6ab8933a6..e5caf1b13 100644
--- a/playwright/src/test/java/com/microsoft/playwright/Utils.java
+++ b/playwright/src/test/java/com/microsoft/playwright/Utils.java
@@ -19,6 +19,9 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
+import com.microsoft.playwright.fixtures.BrowserName;
+import com.microsoft.playwright.fixtures.Env;
+import com.microsoft.playwright.options.SameSiteAttribute;
 import org.junit.jupiter.api.Assumptions;
 
 import java.io.*;
@@ -31,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BooleanSupplier;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -184,6 +188,34 @@ public static BrowserType getBrowserTypeFromEnv(Playwright playwright) {
     }
   }
 
+  static SameSiteAttribute defaultSameSiteCookieValue(BrowserName browserName) {
+    if (browserName == BrowserName.CHROMIUM) return SameSiteAttribute.LAX;
+    if (browserName == BrowserName.WEBKIT && Env.isLinux) return SameSiteAttribute.LAX;
+    if (browserName == BrowserName.WEBKIT && !Env.isLinux) return SameSiteAttribute.NONE;
+    // for firefox version >= 103 'None' is used.
+    return SameSiteAttribute.NONE;
+  }
+
+  static void waitForCondition(Page page, BooleanSupplier predicate) {
+    waitForCondition(page, predicate, 5_000);
+  }
+
+  static void waitForCondition(Page page, BooleanSupplier predicate, int timeoutMs) {
+    page.waitForCondition(predicate, new Page.WaitForConditionOptions().setTimeout(timeoutMs));
+  }
+
+  static boolean chromiumVersionLessThan(String a, String b) {
+    String[] aParts = a.split("\\.");
+    String[] bParts = b.split("\\.");
+    for (int i = 0; i < 4; i++) {
+      int aPart = Integer.parseInt(aParts[i]);
+      int bPart = Integer.parseInt(bParts[i]);
+      if (aPart > bPart) return false;
+      if (aPart < bPart) return true;
+    }
+    return false;
+  }
+
   static void verifyViewport(Page page, int width, int height) {
     assertEquals(width, page.viewportSize().width);
     assertEquals(height, page.viewportSize().height);
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserInvocation.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserInvocation.java
new file mode 100644
index 000000000..6f84335b9
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserInvocation.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * One invocation of a {@link PlaywrightTest}: binds the browser, resolves fixture parameters and
+ * applies the {@link EnabledOnBrowser}/{@link DisabledOnBrowser} conditions.
+ */
+final class BrowserInvocation implements TestTemplateInvocationContext, ParameterResolver, ExecutionCondition {
+  private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(BrowserInvocation.class);
+
+  private final BrowserName browserName;
+
+  BrowserInvocation(BrowserName browserName) {
+    this.browserName = browserName;
+  }
+
+  @Override
+  public String getDisplayName(int invocationIndex) {
+    return "[" + browserName + "]";
+  }
+
+  @Override
+  public List<Extension> getAdditionalExtensions() {
+    return Collections.singletonList(this);
+  }
+
+  @Override
+  public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+    List<AnnotatedElement> elements = new ArrayList<>();
+    context.getTestMethod().ifPresent(elements::add);
+    for (Class<?> clazz = context.getRequiredTestClass(); clazz != null; clazz = clazz.getEnclosingClass()) {
+      for (Class<?> c = clazz; c != null && c != Object.class; c = c.getSuperclass()) {
+        elements.add(c);
+      }
+    }
+    for (AnnotatedElement element : elements) {
+      for (DisabledOnBrowser disabled : element.getAnnotationsByType(DisabledOnBrowser.class)) {
+        if (Arrays.asList(disabled.value()).contains(browserName) && matchesOs(disabled.os()) && (!disabled.headed() || Env.headed())) {
+          return ConditionEvaluationResult.disabled("Disabled on " + browserName + reason(disabled.reason()));
+        }
+      }
+      EnabledOnBrowser enabled = element.getAnnotation(EnabledOnBrowser.class);
+      if (enabled != null && !Arrays.asList(enabled.value()).contains(browserName)) {
+        return ConditionEvaluationResult.disabled("Enabled only on " + Arrays.toString(enabled.value()) + reason(enabled.reason()));
+      }
+    }
+    return ConditionEvaluationResult.enabled("Running in " + browserName);
+  }
+
+  private static boolean matchesOs(OS[] os) {
+    if (os.length == 0) {
+      return true;
+    }
+    for (OS candidate : os) {
+      if (candidate.isCurrentOs()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static String reason(String reason) {
+    return reason.isEmpty() ? "" : ": " + reason;
+  }
+
+  @Override
+  public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+    // Constructors are resolved against the class context, which cannot hold per-invocation fixtures.
+    if (parameterContext.getDeclaringExecutable() instanceof Constructor) {
+      return false;
+    }
+    if (parameterContext.isAnnotated(TempDir.class)) {
+      return false;
+    }
+    return registry(extensionContext).supports(parameterContext.getParameter().getType());
+  }
+
+  @Override
+  public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
+    return scope(extensionContext).get(parameterContext.getParameter().getType());
+  }
+
+  private static FixtureRegistry registry(ExtensionContext context) {
+    return FixtureRegistry.forTestClass(context.getRequiredTestClass());
+  }
+
+  private TestScope scope(ExtensionContext context) {
+    return context.getStore(NAMESPACE).getOrComputeIfAbsent(TestScope.class,
+      key -> new TestScope(context, registry(context), browserName), TestScope.class);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserName.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserName.java
new file mode 100644
index 000000000..1a1670590
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/BrowserName.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import com.microsoft.playwright.BrowserType;
+import com.microsoft.playwright.Playwright;
+
+/**
+ * The browser a test invocation runs in. Available as a fixture parameter.
+ */
+public enum BrowserName {
+  CHROMIUM("chromium"),
+  FIREFOX("firefox"),
+  WEBKIT("webkit");
+
+  private final String name;
+
+  BrowserName(String name) {
+    this.name = name;
+  }
+
+  public static BrowserName fromString(String name) {
+    for (BrowserName value : values()) {
+      if (value.name.equals(name)) {
+        return value;
+      }
+    }
+    throw new IllegalArgumentException("Unknown browser: " + name);
+  }
+
+  public BrowserType browserType(Playwright playwright) {
+    switch (this) {
+      case CHROMIUM: return playwright.chromium();
+      case FIREFOX: return playwright.firefox();
+      case WEBKIT: return playwright.webkit();
+      default: throw new IllegalStateException();
+    }
+  }
+
+  @Override
+  public String toString() {
+    return name;
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/BuiltinFixture.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/BuiltinFixture.java
new file mode 100644
index 000000000..07ad961b4
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/BuiltinFixture.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.BrowserType;
+import com.microsoft.playwright.HttpsServer;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Playwright;
+import com.microsoft.playwright.Server;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * The fixtures every test can use without declaring anything, the counterpart of the
+ * {@code browserTest} fixtures upstream.
+ */
+final class BuiltinFixture<T> implements FixtureDefinition {
+  interface Factory<T> {
+    T create(FixtureResolver resolver) throws Exception;
+  }
+
+  interface Closer<T> {
+    void close(T value) throws Exception;
+  }
+
+  /** Bound by the worker to the browser the test invocation runs in. */
+  static final BuiltinFixture<BrowserName> BROWSER_NAME = worker(BrowserName.class, resolver -> {
+    throw new IllegalStateException("BrowserName is bound by the worker");
+  }, null);
+
+  static final BuiltinFixture<Browser> BROWSER = worker(Browser.class,
+    resolver -> resolver.get(BrowserType.class).launch(resolver.get(BrowserType.LaunchOptions.class)),
+    Browser::close);
+
+  static final List<FixtureDefinition> ALL = Collections.unmodifiableList(Arrays.asList(
+    BROWSER_NAME,
+    worker(Playwright.CreateOptions.class, resolver -> new Playwright.CreateOptions(), null),
+    worker(Playwright.class, resolver -> Playwright.create(resolver.get(Playwright.CreateOptions.class)), Playwright::close),
+    worker(BrowserType.class, resolver -> resolver.get(BrowserName.class).browserType(resolver.get(Playwright.class)), null),
+    worker(BrowserType.LaunchOptions.class, resolver -> Env.launchOptions(), null),
+    BROWSER,
+    worker(Server.class, resolver -> Server.createHttp(), Server::stop),
+    worker(HttpsServer.class, resolver -> Server.createHttps(), Server::stop),
+    // The test-scoped servers are the worker ones, reset before every test.
+    test(Server.class, resolver -> reset(resolver.get(Server.class)), null),
+    test(HttpsServer.class, resolver -> reset(resolver.get(HttpsServer.class)), null),
+    test(Browser.NewContextOptions.class, resolver -> new Browser.NewContextOptions(), null),
+    test(BrowserContext.class,
+      resolver -> resolver.get(Browser.class).newContext(resolver.get(Browser.NewContextOptions.class)),
+      BrowserContext::close),
+    test(Page.class, resolver -> resolver.get(BrowserContext.class).newPage(), null)));
+
+  private final Class<T> type;
+  private final Scope scope;
+  private final Factory<T> factory;
+  private final Closer<T> closer;
+
+  private static <S extends Server> S reset(S server) {
+    server.reset();
+    return server;
+  }
+
+  private static <T> BuiltinFixture<T> worker(Class<T> type, Factory<T> factory, Closer<T> closer) {
+    return new BuiltinFixture<>(type, Scope.WORKER, factory, closer);
+  }
+
+  private static <T> BuiltinFixture<T> test(Class<T> type, Factory<T> factory, Closer<T> closer) {
+    return new BuiltinFixture<>(type, Scope.TEST, factory, closer);
+  }
+
+  private BuiltinFixture(Class<T> type, Scope scope, Factory<T> factory, Closer<T> closer) {
+    this.type = type;
+    this.scope = scope;
+    this.factory = factory;
+    this.closer = closer;
+  }
+
+  @Override
+  public Class<?> type() {
+    return type;
+  }
+
+  @Override
+  public Scope scope() {
+    return scope;
+  }
+
+  @Override
+  public Object identity() {
+    return this;
+  }
+
+  @Override
+  public Object create(FixtureResolver resolver) throws Exception {
+    return factory.create(resolver);
+  }
+
+  @Override
+  public void close(Object value) throws Exception {
+    if (closer != null) {
+      closer.close(type.cast(value));
+    }
+  }
+
+  @Override
+  public String describe() {
+    return "built-in " + scope.name().toLowerCase() + " fixture " + type.getSimpleName();
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/DisabledOnBrowser.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/DisabledOnBrowser.java
new file mode 100644
index 000000000..d666115ad
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/DisabledOnBrowser.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import org.junit.jupiter.api.condition.OS;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Skips the annotated {@link PlaywrightTest} (or every test of the annotated class) in the listed
+ * browsers, the counterpart of {@code test.skip(({ browserName }) => browserName === 'webkit', reason)}.
+ * The condition can be narrowed to some operating systems or to headed mode, as in
+ * {@code test.skip(({ browserName, isMac }) => browserName === 'webkit' && isMac)}.
+ */
+@Documented
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(DisabledOnBrowser.List.class)
+public @interface DisabledOnBrowser {
+  BrowserName[] value();
+
+  /** Only skip on these operating systems; empty means any. */
+  OS[] os() default {};
+
+  /** Only skip when the browser runs headed, see {@link Env#headed()}. */
+  boolean headed() default false;
+
+  String reason() default "";
+
+  @Documented
+  @Target({ElementType.METHOD, ElementType.TYPE})
+  @Retention(RetentionPolicy.RUNTIME)
+  @interface List {
+    DisabledOnBrowser[] value();
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/EnabledOnBrowser.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/EnabledOnBrowser.java
new file mode 100644
index 000000000..8f1e9bcbd
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/EnabledOnBrowser.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Runs the annotated {@link PlaywrightTest} (or every test of the annotated class) only in the
+ * listed browsers; the other invocations are reported as skipped.
+ */
+@Documented
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnabledOnBrowser {
+  BrowserName[] value();
+  String reason() default "";
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/Env.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/Env.java
new file mode 100644
index 000000000..05aecd58b
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/Env.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import com.microsoft.playwright.BrowserType;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Test configuration taken from the environment, the counterpart of the project options and
+ * platform fixtures upstream.
+ */
+public final class Env {
+  public static final boolean isMac;
+  public static final boolean isLinux;
+  public static final boolean isWindows;
+
+  static {
+    String os = System.getProperty("os.name").toLowerCase();
+    isWindows = os.contains("win");
+    isLinux = os.contains("linux");
+    isMac = os.contains("mac os x");
+  }
+
+  private Env() {
+  }
+
+  /**
+   * Browsers every {@link PlaywrightTest} runs in: the comma-separated {@code BROWSER} environment
+   * variable, or all three browsers when it is not set.
+   */
+  public static List<BrowserName> browserNames() {
+    String env = System.getenv("BROWSER");
+    if (env == null || env.trim().isEmpty()) {
+      return Collections.unmodifiableList(Arrays.asList(BrowserName.values()));
+    }
+    List<BrowserName> result = new ArrayList<>();
+    for (String name : env.split(",")) {
+      BrowserName browserName = BrowserName.fromString(name.trim());
+      if (!result.contains(browserName)) {
+        result.add(browserName);
+      }
+    }
+    return Collections.unmodifiableList(result);
+  }
+
+  /** {@code HEADED=1} launches the browsers with a window. */
+  public static boolean headed() {
+    String value = System.getenv("HEADED");
+    return value != null && !"0".equals(value) && !"false".equals(value);
+  }
+
+  /** {@code BROWSER_CHANNEL} picks a browser distribution such as {@code chrome} or {@code msedge}. */
+  public static String channel() {
+    return System.getenv("BROWSER_CHANNEL");
+  }
+
+  /** Fresh launch options honoring {@link #headed()} and {@link #channel()}. */
+  public static BrowserType.LaunchOptions launchOptions() {
+    BrowserType.LaunchOptions options = new BrowserType.LaunchOptions();
+    options.headless = !headed();
+    options.channel = channel();
+    return options;
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/Fixture.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/Fixture.java
new file mode 100644
index 000000000..855c6b202
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/Fixture.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Declares a fixture factory on a test class, a superclass, an implemented interface (default
+ * method) or an enclosing class of a {@code @Nested} test. The Java counterpart of
+ * {@code test.extend({ name: async ({ deps }, use) => ... })} upstream.
+ *
+ * <p>The method's return type is the fixture type that test parameters are resolved by. Its
+ * parameters are the fixtures it depends on. A parameter of the method's own return type resolves
+ * to the fixture being overridden, so defaults can be adjusted rather than rebuilt:
+ * <pre>{@code
+ * @Fixture
+ * Browser.NewContextOptions contextOptions() {
+ *   return new Browser.NewContextOptions().setHasTouch(true);
+ * }
+ *
+ * @Fixture(scope = Scope.WORKER)
+ * static BrowserType.LaunchOptions launchOptions(BrowserType.LaunchOptions defaults) {
+ *   return defaults.setArgs(asList("--enable-features=WebMCP"));
+ * }
+ * }</pre>
+ *
+ * <p>A value that implements {@link AutoCloseable} is closed when its scope ends, in reverse
+ * creation order. Worker-scoped fixture methods must be static and may only depend on other
+ * worker-scoped fixtures; test-scoped ones may be instance methods and so can use fields injected
+ * by other extensions (Spring, Micronaut, {@code @TempDir}, {@code @Parameter}).
+ */
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Fixture {
+  Scope scope() default Scope.TEST;
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureDefinition.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureDefinition.java
new file mode 100644
index 000000000..f5e0cc16f
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureDefinition.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+/**
+ * A fixture factory: either one of the built-in fixtures or a {@link Fixture} method.
+ */
+interface FixtureDefinition {
+  Class<?> type();
+
+  Scope scope();
+
+  /** Stable key for cached values; equal for the same definition seen through different test classes. */
+  Object identity();
+
+  Object create(FixtureResolver resolver) throws Exception;
+
+  void close(Object value) throws Exception;
+
+  String describe();
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureRegistry.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureRegistry.java
new file mode 100644
index 000000000..fdd0ced29
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureRegistry.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * The fixtures visible to a test class: the built-in ones followed by the {@link Fixture} methods
+ * found on its enclosing classes, supertypes and the class itself. For every fixture type the
+ * registry keeps the chain of definitions in that order, the last one being the most specific
+ * and the one a test parameter resolves to.
+ */
+final class FixtureRegistry {
+  private static final Map<Class<?>, FixtureRegistry> CACHE = new ConcurrentHashMap<>();
+
+  private final Map<Class<?>, List<FixtureDefinition>> chains = new HashMap<>();
+  private final List<Method> workerMethods = new ArrayList<>();
+
+  static FixtureRegistry forTestClass(Class<?> testClass) {
+    return CACHE.computeIfAbsent(testClass, FixtureRegistry::new);
+  }
+
+  private FixtureRegistry(Class<?> testClass) {
+    for (FixtureDefinition definition : BuiltinFixture.ALL) {
+      add(definition);
+    }
+    for (Class<?> clazz : lookupOrder(testClass)) {
+      List<Method> methods = new ArrayList<>();
+      for (Method method : clazz.getDeclaredMethods()) {
+        if (method.isAnnotationPresent(Fixture.class)) {
+          methods.add(method);
+        }
+      }
+      // Declaration order is not guaranteed by reflection.
+      methods.sort(Comparator.comparing(Method::getName));
+      List<Class<?>> typesInClass = new ArrayList<>();
+      for (Method method : methods) {
+        MethodFixture definition = new MethodFixture(method);
+        if (typesInClass.contains(definition.type())) {
+          throw new IllegalStateException(clazz.getName() + " declares more than one @Fixture of type " + definition.type().getName());
+        }
+        typesInClass.add(definition.type());
+        add(definition);
+      }
+    }
+  }
+
+  /** Outermost enclosing class first, each preceded by its supertypes; the test class last. */
+  private static List<Class<?>> lookupOrder(Class<?> testClass) {
+    List<Class<?>> nesting = new ArrayList<>();
+    for (Class<?> clazz = testClass; clazz != null; clazz = clazz.getEnclosingClass()) {
+      nesting.add(0, clazz);
+    }
+    List<Class<?>> result = new ArrayList<>();
+    for (Class<?> clazz : nesting) {
+      addHierarchy(clazz, result);
+    }
+    return result;
+  }
+
+  private static void addHierarchy(Class<?> clazz, List<Class<?>> out) {
+    if (clazz == null || clazz == Object.class || out.contains(clazz)) {
+      return;
+    }
+    addHierarchy(clazz.getSuperclass(), out);
+    for (Class<?> iface : clazz.getInterfaces()) {
+      addHierarchy(iface, out);
+    }
+    out.add(clazz);
+  }
+
+  private void add(FixtureDefinition definition) {
+    chains.computeIfAbsent(definition.type(), k -> new ArrayList<>()).add(definition);
+    if (definition.scope() == Scope.WORKER && definition instanceof MethodFixture) {
+      workerMethods.add(((MethodFixture) definition).method());
+    }
+  }
+
+  boolean supports(Class<?> type) {
+    return chains.containsKey(type);
+  }
+
+  List<FixtureDefinition> chain(Class<?> type) {
+    List<FixtureDefinition> chain = chains.get(type);
+    return chain == null ? Collections.emptyList() : chain;
+  }
+
+  /** The worker-scoped overrides; tests with equal lists can share a worker. */
+  List<Method> workerMethods() {
+    return Collections.unmodifiableList(workerMethods);
+  }
+
+  @Override
+  public String toString() {
+    return "FixtureRegistry" + Arrays.toString(chains.keySet().toArray());
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureResolver.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureResolver.java
new file mode 100644
index 000000000..8841a2c54
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureResolver.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+/**
+ * Resolves the dependencies of a fixture while it is being created.
+ */
+interface FixtureResolver {
+  /**
+   * Returns the fixture of the given type. Asking for the type of the fixture being created
+   * returns the definition it overrides, the way an upstream fixture can depend on the fixture
+   * of the same name from the base test.
+   */
+  <T> T get(Class<T> type);
+
+  /** The test instance a non-static {@link Fixture} method is invoked on. */
+  Object testInstance(Class<?> declaringClass);
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/MethodFixture.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/MethodFixture.java
new file mode 100644
index 000000000..c89eff966
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/MethodFixture.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+
+/**
+ * A fixture declared with a {@link Fixture} method on a test class.
+ */
+final class MethodFixture implements FixtureDefinition {
+  private final Method method;
+  private final Scope scope;
+
+  MethodFixture(Method method) {
+    this.method = method;
+    this.scope = method.getAnnotation(Fixture.class).scope();
+    if (method.getReturnType() == void.class) {
+      throw new IllegalStateException(describe() + " must return the fixture value");
+    }
+    if (scope == Scope.WORKER && !Modifier.isStatic(method.getModifiers())) {
+      throw new IllegalStateException(describe() + " is worker-scoped and must be static");
+    }
+  }
+
+  Method method() {
+    return method;
+  }
+
+  @Override
+  public Class<?> type() {
+    return method.getReturnType();
+  }
+
+  @Override
+  public Scope scope() {
+    return scope;
+  }
+
+  @Override
+  public Object identity() {
+    return method;
+  }
+
+  @Override
+  public Object create(FixtureResolver resolver) throws Exception {
+    Parameter[] parameters = method.getParameters();
+    Object[] args = new Object[parameters.length];
+    for (int i = 0; i < parameters.length; i++) {
+      args[i] = resolver.get(parameters[i].getType());
+    }
+    Object target = Modifier.isStatic(method.getModifiers()) ? null : resolver.testInstance(method.getDeclaringClass());
+    method.setAccessible(true);
+    try {
+      return method.invoke(target, args);
+    } catch (InvocationTargetException e) {
+      Throwable cause = e.getCause();
+      if (cause instanceof Exception) {
+        throw (Exception) cause;
+      }
+      throw (Error) cause;
+    }
+  }
+
+  @Override
+  public void close(Object value) throws Exception {
+    if (value instanceof AutoCloseable) {
+      ((AutoCloseable) value).close();
+    }
+  }
+
+  @Override
+  public String describe() {
+    return "@Fixture " + method.getDeclaringClass().getSimpleName() + "." + method.getName() + "()";
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return o instanceof MethodFixture && method.equals(((MethodFixture) o).method);
+  }
+
+  @Override
+  public int hashCode() {
+    return method.hashCode();
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java
new file mode 100644
index 000000000..20a21e2d9
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import java.util.stream.Stream;
+
+/**
+ * Runs every {@link PlaywrightTest} once per browser from {@link Env#browserNames()}.
+ */
+public final class PlaywrightExtension implements TestTemplateInvocationContextProvider {
+  private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(PlaywrightExtension.class);
+
+  /** Closes the idle workers when the whole test run is over. */
+  @SuppressWarnings("deprecation")
+  private static final class PoolCloser implements AutoCloseable, ExtensionContext.Store.CloseableResource {
+    @Override
+    public void close() {
+      WorkerPool.INSTANCE.closeAll();
+    }
+  }
+
+  @Override
+  public boolean supportsTestTemplate(ExtensionContext context) {
+    return context.getTestMethod().filter(method -> AnnotationSupport.isAnnotated(method, PlaywrightTest.class)).isPresent();
+  }
+
+  @Override
+  public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(ExtensionContext context) {
+    context.getRoot().getStore(NAMESPACE).getOrComputeIfAbsent(PoolCloser.class, key -> new PoolCloser(), PoolCloser.class);
+    return Env.browserNames().stream().map(BrowserInvocation::new);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightTest.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightTest.java
new file mode 100644
index 000000000..610e93195
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a test method that runs once per browser selected by the {@code BROWSER} environment
+ * variable (all three browsers by default), the Java counterpart of a Playwright Test project.
+ * Invocations are named after the browser ({@code [chromium]}, {@code [firefox]}, {@code [webkit]});
+ * reports that only show the invocation index number them in the order of {@link Env#browserNames()}.
+ *
+ * <p>Fixtures are injected as method parameters, mirroring the destructured fixtures of
+ * {@code test('...', async ({ page, server }) => ...)} upstream:
+ * <pre>{@code
+ * @PlaywrightTest
+ * void shouldWork(Page page, Server server) {
+ *   page.navigate(server.EMPTY_PAGE);
+ * }
+ * }</pre>
+ *
+ * <p>Built-in fixtures: {@link com.microsoft.playwright.Playwright}, {@link BrowserName},
+ * {@link com.microsoft.playwright.BrowserType}, {@link com.microsoft.playwright.BrowserType.LaunchOptions},
+ * {@link com.microsoft.playwright.Browser}, {@link com.microsoft.playwright.Browser.NewContextOptions},
+ * {@link com.microsoft.playwright.BrowserContext}, {@link com.microsoft.playwright.Page},
+ * {@link com.microsoft.playwright.Server} and {@link com.microsoft.playwright.HttpsServer}.
+ * Worker-scoped fixtures (Playwright, Browser, servers) are reused by the tests that run
+ * sequentially on the same thread; test-scoped ones (context, page) are created for every test
+ * that asks for them and closed afterwards. A test class overrides or adds fixtures with
+ * {@link Fixture} methods.
+ */
+@Documented
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@TestTemplate
+@ExtendWith(PlaywrightExtension.class)
+public @interface PlaywrightTest {
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/Scope.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/Scope.java
new file mode 100644
index 000000000..6e3671acb
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/Scope.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+/**
+ * Lifetime of a {@link Fixture}.
+ */
+public enum Scope {
+  /** Created for every test that uses it and torn down when the test finishes. */
+  TEST,
+  /**
+   * Shared by all the tests that run on the same worker, like a Playwright Test worker fixture.
+   * A worker is a thread-bound bundle of Playwright, Browser and test servers; it is kept alive
+   * across tests and classes as long as they request the same worker-scoped fixtures.
+   */
+  WORKER
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestPlaywrightFixtures.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestPlaywrightFixtures.java
new file mode 100644
index 000000000..e38aedd52
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestPlaywrightFixtures.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
+import com.microsoft.playwright.BrowserType;
+import com.microsoft.playwright.HttpsServer;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Playwright;
+import com.microsoft.playwright.Server;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.Parameter;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.microsoft.playwright.fixtures.BrowserName.CHROMIUM;
+import static com.microsoft.playwright.fixtures.BrowserName.FIREFOX;
+import static com.microsoft.playwright.fixtures.BrowserName.WEBKIT;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestPlaywrightFixtures {
+  private static final AtomicInteger createdResources = new AtomicInteger();
+  private static final AtomicInteger closedResources = new AtomicInteger();
+
+  static final class Resource implements AutoCloseable {
+    final Page page;
+
+    Resource(Page page) {
+      this.page = page;
+      createdResources.incrementAndGet();
+    }
+
+    @Override
+    public void close() {
+      closedResources.incrementAndGet();
+    }
+  }
+
+  private BrowserName browserNameFromBeforeEach;
+
+  @Fixture
+  Resource resource(Page page) {
+    return new Resource(page);
+  }
+
+  @BeforeEach
+  void rememberBrowser(BrowserName browserName) {
+    browserNameFromBeforeEach = browserName;
+  }
+
+  @AfterAll
+  static void allResourcesClosed() {
+    assertTrue(createdResources.get() > 0);
+    assertEquals(createdResources.get(), closedResources.get());
+  }
+
+  @PlaywrightTest
+  void shouldInjectBuiltInFixtures(Page page, BrowserContext context, Browser browser, BrowserType browserType,
+                                   Playwright playwright, Server server, HttpsServer httpsServer, BrowserName browserName) {
+    assertSame(context, page.context());
+    assertSame(browser, context.browser());
+    assertSame(browserType, browser.browserType());
+    assertEquals(browserName.toString(), browserType.name());
+    assertSame(browserType, browserName.browserType(playwright));
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(server.EMPTY_PAGE, page.url());
+    assertNotEquals(server.PORT, httpsServer.PORT);
+    assertTrue(httpsServer.PREFIX.startsWith("https://"));
+  }
+
+  @PlaywrightTest
+  void shouldCreateNewContextPerTest(BrowserContext context) {
+    assertEquals(0, context.pages().size());
+  }
+
+  @PlaywrightTest
+  void shouldResetServerBetweenTests(Page page, Server server) {
+    // Whichever of the two tests runs first on a worker, the route set by the other one is gone.
+    assertEquals(404, page.navigate(server.PREFIX + "/reset").status());
+    server.setRoute("/reset", exchange -> exchange.sendResponseHeaders(200, -1));
+    assertEquals(200, page.navigate(server.PREFIX + "/reset").status());
+  }
+
+  @PlaywrightTest
+  void shouldResetServerBetweenTests2(Page page, Server server) {
+    assertEquals(404, page.navigate(server.PREFIX + "/reset").status());
+    server.setRoute("/reset", exchange -> exchange.sendResponseHeaders(200, -1));
+    assertEquals(200, page.navigate(server.PREFIX + "/reset").status());
+  }
+
+  @PlaywrightTest
+  void shouldInjectCustomFixture(Resource resource, Page page) {
+    assertSame(page, resource.page);
+  }
+
+  @PlaywrightTest
+  void shouldInjectIntoBeforeEach(BrowserName browserName) {
+    assertEquals(browserName, browserNameFromBeforeEach);
+  }
+
+  @PlaywrightTest
+  @DisabledOnBrowser(value = {FIREFOX, WEBKIT}, reason = "checks the condition")
+  void shouldSkipDisabledBrowsers(BrowserName browserName) {
+    assertEquals(CHROMIUM, browserName);
+  }
+
+  @PlaywrightTest
+  @DisabledOnBrowser(FIREFOX)
+  @DisabledOnBrowser(value = WEBKIT, reason = "repeatable")
+  void shouldSkipRepeatedDisabledBrowsers(BrowserName browserName) {
+    assertEquals(CHROMIUM, browserName);
+  }
+
+  @PlaywrightTest
+  @EnabledOnBrowser(WEBKIT)
+  void shouldRunOnlyOnEnabledBrowsers(BrowserName browserName) {
+    assertEquals(WEBKIT, browserName);
+  }
+
+  @Nested
+  class WithTouch {
+    @Fixture
+    Browser.NewContextOptions contextOptions() {
+      return new Browser.NewContextOptions().setHasTouch(true);
+    }
+
+    @PlaywrightTest
+    void shouldUseOverriddenContextOptions(Page page, Server server, Resource resource) {
+      page.navigate(server.PREFIX + "/mobile.html");
+      assertEquals(true, page.evaluate("'ontouchstart' in window"));
+      assertSame(page, resource.page);
+    }
+  }
+
+  @Nested
+  @EnabledOnBrowser(CHROMIUM)
+  class ChromiumOnly {
+    @PlaywrightTest
+    void shouldHonorClassLevelCondition(BrowserName browserName) {
+      assertEquals(CHROMIUM, browserName);
+    }
+  }
+
+  @Nested
+  @ParameterizedClass
+  @ValueSource(ints = {400, 600})
+  class WithViewportWidth {
+    @Parameter
+    int width;
+
+    @Fixture
+    Browser.NewContextOptions contextOptions() {
+      return new Browser.NewContextOptions().setViewportSize(width, 300);
+    }
+
+    @PlaywrightTest
+    void shouldUseClassParameter(Page page) {
+      assertEquals(width, page.evaluate("window.innerWidth"));
+    }
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java
new file mode 100644
index 000000000..b539a2847
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.opentest4j.TestAbortedException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The fixtures of one test invocation: resolves and caches test-scoped values, borrows a
+ * {@link Worker} for the worker-scoped ones, and tears everything down when the test is over.
+ */
+final class TestScope implements AutoCloseable {
+  private static final class Entry {
+    final FixtureDefinition definition;
+    final Object value;
+
+    Entry(FixtureDefinition definition, Object value) {
+      this.definition = definition;
+      this.value = value;
+    }
+  }
+
+  private final ExtensionContext context;
+  private final FixtureRegistry registry;
+  private final BrowserName browserName;
+  private final Map<Object, Object> values = new HashMap<>();
+  private final List<Entry> created = new ArrayList<>();
+  private final Set<FixtureDefinition> resolving = new LinkedHashSet<>();
+  private Worker worker;
+
+  TestScope(ExtensionContext context, FixtureRegistry registry, BrowserName browserName) {
+    this.context = context;
+    this.registry = registry;
+    this.browserName = browserName;
+  }
+
+  <T> T get(Class<T> type) {
+    List<FixtureDefinition> chain = registry.chain(type);
+    if (chain.isEmpty()) {
+      throw new ParameterResolutionException("No fixture of type " + type.getName());
+    }
+    return type.cast(resolve(chain.get(chain.size() - 1)));
+  }
+
+  private Object resolve(FixtureDefinition definition) {
+    try {
+      if (definition.scope() == Scope.WORKER) {
+        return worker().get(definition, new Resolver(definition));
+      }
+      Object value = values.get(definition.identity());
+      if (value == null) {
+        value = create(definition);
+        values.put(definition.identity(), value);
+        created.add(new Entry(definition, value));
+      }
+      return value;
+    } catch (RuntimeException | Error e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException(definition.describe() + " failed", e);
+    }
+  }
+
+  private Object create(FixtureDefinition definition) throws Exception {
+    if (!resolving.add(definition)) {
+      throw new IllegalStateException("Fixture dependency cycle: " + resolving + " -> " + definition.describe());
+    }
+    try {
+      Object value = definition.create(new Resolver(definition));
+      if (value == null) {
+        throw new IllegalStateException(definition.describe() + " returned null");
+      }
+      return value;
+    } finally {
+      resolving.remove(definition);
+    }
+  }
+
+  private Worker worker() {
+    if (worker == null) {
+      worker = WorkerPool.INSTANCE.acquire(new Worker.Key(browserName, registry.workerMethods()));
+    }
+    return worker;
+  }
+
+  @Override
+  public void close() {
+    for (int i = created.size() - 1; i >= 0; i--) {
+      Entry entry = created.get(i);
+      try {
+        entry.definition.close(entry.value);
+      } catch (Throwable e) {
+        System.err.println("Failed to close " + entry.definition.describe() + ": " + e);
+      }
+    }
+    created.clear();
+    values.clear();
+    if (worker != null) {
+      // Like Playwright Test, do not reuse a worker after a failure: the test may have left the
+      // browser or the Playwright instance in an unknown state.
+      boolean failed = context.getExecutionException().filter(e -> !(e instanceof TestAbortedException)).isPresent();
+      WorkerPool.INSTANCE.release(worker, failed);
+      worker = null;
+    }
+  }
+
+  private final class Resolver implements FixtureResolver {
+    private final FixtureDefinition from;
+
+    Resolver(FixtureDefinition from) {
+      this.from = from;
+    }
+
+    @Override
+    public <T> T get(Class<T> type) {
+      List<FixtureDefinition> chain = registry.chain(type);
+      FixtureDefinition target;
+      if (type.equals(from.type())) {
+        int index = chain.indexOf(from);
+        if (index <= 0) {
+          throw new IllegalStateException(from.describe() + " does not override another fixture of type " + type.getName());
+        }
+        target = chain.get(index - 1);
+      } else {
+        if (chain.isEmpty()) {
+          throw new IllegalStateException(from.describe() + " depends on unknown fixture type " + type.getName());
+        }
+        target = chain.get(chain.size() - 1);
+      }
+      if (from.scope() == Scope.WORKER && target.scope() == Scope.TEST) {
+        throw new IllegalStateException("Worker-scoped " + from.describe() + " cannot depend on test-scoped " + target.describe());
+      }
+      return type.cast(resolve(target));
+    }
+
+    @Override
+    public Object testInstance(Class<?> declaringClass) {
+      if (from.scope() == Scope.WORKER) {
+        throw new IllegalStateException("Worker-scoped " + from.describe() + " must be static");
+      }
+      return context.getRequiredTestInstances().findInstance(declaringClass)
+        .orElseThrow(() -> new IllegalStateException("No test instance of " + declaringClass.getName() + " to invoke " + from.describe()));
+    }
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java
new file mode 100644
index 000000000..04a34bc76
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserType;
+import org.junit.jupiter.api.AfterAll;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestWorkerFixtures {
+  private static final AtomicInteger created = new AtomicInteger();
+  private static final AtomicInteger closed = new AtomicInteger();
+
+  static final class WorkerResource implements AutoCloseable {
+    final Browser browser;
+
+    WorkerResource(Browser browser) {
+      this.browser = browser;
+      created.incrementAndGet();
+    }
+
+    @Override
+    public void close() {
+      closed.incrementAndGet();
+    }
+  }
+
+  @Fixture(scope = Scope.WORKER)
+  static BrowserType.LaunchOptions launchOptions(BrowserType.LaunchOptions defaults) {
+    assertEquals(!Env.headed(), defaults.headless);
+    return defaults.setTimeout(123456);
+  }
+
+  @Fixture(scope = Scope.WORKER)
+  static WorkerResource workerResource(Browser browser) {
+    return new WorkerResource(browser);
+  }
+
+  @AfterAll
+  static void workerResourcesOutliveTests() {
+    // Worker fixtures are closed with their worker, which the pool may evict while other classes
+    // run, never once per test.
+    assertTrue(created.get() > 0);
+    assertTrue(closed.get() <= created.get(), "created " + created.get() + ", closed " + closed.get());
+  }
+
+  @PlaywrightTest
+  void shouldLaunchWithOverriddenOptions(BrowserType.LaunchOptions launchOptions, Browser browser, WorkerResource resource) {
+    assertEquals(123456, launchOptions.timeout);
+    assertTrue(browser.isConnected());
+    assertSame(browser, resource.browser);
+  }
+
+  @PlaywrightTest
+  void shouldReuseWorkerFixtures(Browser browser, WorkerResource resource) {
+    assertSame(browser, resource.browser);
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java
new file mode 100644
index 000000000..85b361ba4
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import com.microsoft.playwright.Browser;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A bundle of worker-scoped fixture values, the counterpart of a Playwright Test worker process.
+ * Playwright Java objects are not thread-safe, so a worker is only ever used by one test at a
+ * time; tests that run one after another on a thread reuse it through the {@link WorkerPool}.
+ */
+final class Worker implements AutoCloseable {
+  /** Workers with equal keys are interchangeable. */
+  static final class Key {
+    final BrowserName browserName;
+    final List<Method> workerMethods;
+
+    Key(BrowserName browserName, List<Method> workerMethods) {
+      this.browserName = browserName;
+      this.workerMethods = workerMethods;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (!(o instanceof Key)) {
+        return false;
+      }
+      Key other = (Key) o;
+      return browserName == other.browserName && workerMethods.equals(other.workerMethods);
+    }
+
+    @Override
+    public int hashCode() {
+      return 31 * browserName.hashCode() + workerMethods.hashCode();
+    }
+
+    @Override
+    public String toString() {
+      return browserName + (workerMethods.isEmpty() ? "" : " " + workerMethods);
+    }
+  }
+
+  private static final class Entry {
+    final FixtureDefinition definition;
+    final Object value;
+
+    Entry(FixtureDefinition definition, Object value) {
+      this.definition = definition;
+      this.value = value;
+    }
+  }
+
+  final Key key;
+  private final Map<Object, Object> values = new HashMap<>();
+  private final List<Entry> created = new ArrayList<>();
+
+  Worker(Key key) {
+    this.key = key;
+    values.put(BuiltinFixture.BROWSER_NAME.identity(), key.browserName);
+  }
+
+  Object get(FixtureDefinition definition, FixtureResolver resolver) throws Exception {
+    Object value = values.get(definition.identity());
+    if (value == null) {
+      value = definition.create(resolver);
+      if (value == null) {
+        throw new IllegalStateException(definition.describe() + " returned null");
+      }
+      values.put(definition.identity(), value);
+      created.add(new Entry(definition, value));
+    }
+    return value;
+  }
+
+  /** A worker whose browser got disconnected cannot serve another test. */
+  boolean isHealthy() {
+    Object browser = values.get(BuiltinFixture.BROWSER.identity());
+    return browser == null || ((Browser) browser).isConnected();
+  }
+
+  @Override
+  public void close() {
+    for (int i = created.size() - 1; i >= 0; i--) {
+      Entry entry = created.get(i);
+      try {
+        entry.definition.close(entry.value);
+      } catch (Throwable e) {
+        System.err.println("Failed to close " + entry.definition.describe() + ": " + e);
+      }
+    }
+    created.clear();
+    values.clear();
+  }
+
+  @Override
+  public String toString() {
+    return "Worker[" + key + "]";
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java
new file mode 100644
index 000000000..4a4bf3a04
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ForkJoinWorkerThread;
+
+/**
+ * Hands out {@link Worker}s to tests. Idle workers are kept for the next test with the same key;
+ * when the pool is full, the least recently used idle worker with a different key is closed to
+ * make room, as Playwright Test tears a worker down when the next test needs different worker
+ * fixtures. Workers are not bound to threads, so the pool is safe with JUnit's fork-join
+ * executor which may add compensation threads or retire idle ones.
+ */
+final class WorkerPool {
+  static final WorkerPool INSTANCE = new WorkerPool();
+
+  // Least recently released first.
+  private final List<Worker> idle = new ArrayList<>();
+  private int busy;
+
+  private WorkerPool() {
+  }
+
+  Worker acquire(Worker.Key key) {
+    Worker evicted = null;
+    synchronized (this) {
+      for (int i = idle.size() - 1; i >= 0; i--) {
+        if (idle.get(i).key.equals(key)) {
+          busy++;
+          return idle.remove(i);
+        }
+      }
+      if (!idle.isEmpty() && idle.size() + busy >= maxWorkers()) {
+        evicted = idle.remove(0);
+      }
+      busy++;
+    }
+    if (evicted != null) {
+      evicted.close();
+    }
+    return new Worker(key);
+  }
+
+  void release(Worker worker, boolean discard) {
+    boolean close = discard || !worker.isHealthy();
+    synchronized (this) {
+      busy--;
+      if (!close) {
+        idle.add(worker);
+      }
+    }
+    if (close) {
+      worker.close();
+    }
+  }
+
+  void closeAll() {
+    List<Worker> workers;
+    synchronized (this) {
+      workers = new ArrayList<>(idle);
+      idle.clear();
+    }
+    for (Worker worker : workers) {
+      worker.close();
+    }
+  }
+
+  /** As many workers as there are test threads; one when tests do not run in parallel. */
+  private static int maxWorkers() {
+    Thread thread = Thread.currentThread();
+    if (thread instanceof ForkJoinWorkerThread) {
+      return ((ForkJoinWorkerThread) thread).getPool().getParallelism();
+    }
+    return 1;
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java
new file mode 100644
index 000000000..76faa445d
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JUnit 5 fixtures for the Playwright tests, a port of the upstream Playwright Test fixtures in
+ * {@code tests/config/browserTest.ts}.
+ *
+ * <h2>Mapping to Playwright Test</h2>
+ * <ul>
+ *   <li>Projects (one per browser) are the invocations of a {@link com.microsoft.playwright.fixtures.PlaywrightTest},
+ *       selected with the {@code BROWSER} environment variable, see {@link com.microsoft.playwright.fixtures.Env}.</li>
+ *   <li>Destructured fixtures {@code ({ page, server })} are method parameters resolved by type.</li>
+ *   <li>{@code test.extend({...})} and {@code test.use({...})} are {@link com.microsoft.playwright.fixtures.Fixture}
+ *       methods on the test class, its supertypes, interfaces or enclosing classes; a method may depend on
+ *       the fixture it overrides by declaring a parameter of its own return type.</li>
+ *   <li>Worker fixtures ({@code scope: 'worker'}) are {@link com.microsoft.playwright.fixtures.Scope#WORKER}
+ *       fixtures. A worker is a bundle of such values that one test uses at a time; the pool hands it to
+ *       the next test with the same worker fixtures and closes it after a failure, as Playwright Test
+ *       restarts a worker process.</li>
+ *   <li>{@code test.skip(({ browserName }) => ...)} is {@link com.microsoft.playwright.fixtures.DisabledOnBrowser}
+ *       or {@link com.microsoft.playwright.fixtures.EnabledOnBrowser}; dynamic conditions use JUnit assumptions.</li>
+ *   <li>Tests generated in a {@code for} loop are a {@code @Nested @ParameterizedClass} whose
+ *       {@code @Parameter} field is read by a {@code @Fixture} method.</li>
+ * </ul>
+ *
+ * <h2>Threading</h2>
+ * Playwright objects are not thread-safe, so every worker is used by a single test at a time and tests
+ * only touch the fixtures they were given. Workers are pooled rather than bound to threads because
+ * JUnit's fork-join executor may add or retire threads; sequential use from different threads is safe.
+ *
+ * <h2>Other extensions</h2>
+ * The resolver only claims parameters whose type is a known fixture, so it coexists with the parameter
+ * resolvers of Spring, Quarkus, Micronaut or {@code @TempDir}. Test-scoped fixture methods may be
+ * instance methods and read fields those extensions injected.
+ */
+package com.microsoft.playwright.fixtures;

From ed346c3f3083adad43158cd6cb0555b00cb1bf15 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Fri, 23 Oct 2026 17:15:16 -0700
Subject: [PATCH 2/2] test(fixtures): close leaked contexts and report teardown
 failures

- close contexts a test leaves open in a worker's browsers before the
  worker is reused, keeping the ones created by worker fixtures
- fail the test when closing its fixtures fails and discard the worker;
  failures to close idle or evicted workers fail the run
- keep a worker per browser for every test thread, since each thread
  runs a test in all browsers in turn, and close idle workers in
  parallel at the end of the run
- check worker reuse with pool unit tests and an isolated integration
  test

Claude-Session: https://claude.ai/code/session_018p7xPf3r5VjAM7V46nzFTM
---
 .../playwright/fixtures/FixtureValues.java    |  69 +++++++
 .../fixtures/PlaywrightExtension.java         |   2 +-
 .../playwright/fixtures/Teardown.java         |  59 ++++++
 .../playwright/fixtures/TestScope.java        |  42 ++---
 .../fixtures/TestWorkerFixtures.java          |  43 ++++-
 .../playwright/fixtures/TestWorkerPool.java   | 175 ++++++++++++++++++
 .../microsoft/playwright/fixtures/Worker.java |  72 +++----
 .../playwright/fixtures/WorkerPool.java       |  68 +++++--
 .../playwright/fixtures/package-info.java     |   6 +-
 9 files changed, 443 insertions(+), 93 deletions(-)
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureValues.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/Teardown.java
 create mode 100644 playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerPool.java

diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureValues.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureValues.java
new file mode 100644
index 000000000..369272ebd
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/FixtureValues.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The fixture values of one test or worker, keyed by fixture identity and closed newest first.
+ */
+final class FixtureValues {
+  private static final class Entry {
+    final FixtureDefinition definition;
+    final Object value;
+
+    Entry(FixtureDefinition definition, Object value) {
+      this.definition = definition;
+      this.value = value;
+    }
+  }
+
+  private final Map<Object, Object> values = new HashMap<>();
+  private final List<Entry> created = new ArrayList<>();
+
+  Object get(FixtureDefinition definition) {
+    return values.get(definition.identity());
+  }
+
+  void add(FixtureDefinition definition, Object value) {
+    values.put(definition.identity(), value);
+    created.add(new Entry(definition, value));
+  }
+
+  /** The created values of the given type, e.g. the browsers of a worker. */
+  <T> List<T> ofType(Class<T> type) {
+    List<T> result = new ArrayList<>();
+    for (Entry entry : created) {
+      if (type.isInstance(entry.value)) {
+        result.add(type.cast(entry.value));
+      }
+    }
+    return result;
+  }
+
+  void close(Teardown teardown) {
+    for (int i = created.size() - 1; i >= 0; i--) {
+      Entry entry = created.get(i);
+      teardown.run(() -> entry.definition.close(entry.value));
+    }
+    created.clear();
+    values.clear();
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java
index 20a21e2d9..c4dd7adf9 100644
--- a/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/PlaywrightExtension.java
@@ -33,7 +33,7 @@ public final class PlaywrightExtension implements TestTemplateInvocationContextP
   @SuppressWarnings("deprecation")
   private static final class PoolCloser implements AutoCloseable, ExtensionContext.Store.CloseableResource {
     @Override
-    public void close() {
+    public void close() throws Exception {
       WorkerPool.INSTANCE.closeAll();
     }
   }
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/Teardown.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/Teardown.java
new file mode 100644
index 000000000..d9965401b
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/Teardown.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+/**
+ * Runs every cleanup step even when earlier ones fail, then reports the first failure with the
+ * others attached as suppressed exceptions, so a broken teardown fails the test instead of being lost.
+ * Steps may run on several threads at once.
+ */
+final class Teardown {
+  interface Step {
+    void run() throws Exception;
+  }
+
+  private Throwable failure;
+
+  void run(Step step) {
+    try {
+      step.run();
+    } catch (Throwable e) {
+      record(e);
+    }
+  }
+
+  private synchronized void record(Throwable e) {
+    if (failure == null) {
+      failure = e;
+    } else if (failure != e) {
+      failure.addSuppressed(e);
+    }
+  }
+
+  synchronized boolean failed() {
+    return failure != null;
+  }
+
+  synchronized void rethrow() throws Exception {
+    if (failure instanceof Error) {
+      throw (Error) failure;
+    }
+    if (failure != null) {
+      throw (Exception) failure;
+    }
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java
index b539a2847..af4e011f8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestScope.java
@@ -20,11 +20,8 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.opentest4j.TestAbortedException;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -32,21 +29,10 @@
  * {@link Worker} for the worker-scoped ones, and tears everything down when the test is over.
  */
 final class TestScope implements AutoCloseable {
-  private static final class Entry {
-    final FixtureDefinition definition;
-    final Object value;
-
-    Entry(FixtureDefinition definition, Object value) {
-      this.definition = definition;
-      this.value = value;
-    }
-  }
-
   private final ExtensionContext context;
   private final FixtureRegistry registry;
   private final BrowserName browserName;
-  private final Map<Object, Object> values = new HashMap<>();
-  private final List<Entry> created = new ArrayList<>();
+  private final FixtureValues values = new FixtureValues();
   private final Set<FixtureDefinition> resolving = new LinkedHashSet<>();
   private Worker worker;
 
@@ -69,11 +55,10 @@ private Object resolve(FixtureDefinition definition) {
       if (definition.scope() == Scope.WORKER) {
         return worker().get(definition, new Resolver(definition));
       }
-      Object value = values.get(definition.identity());
+      Object value = values.get(definition);
       if (value == null) {
         value = create(definition);
-        values.put(definition.identity(), value);
-        created.add(new Entry(definition, value));
+        values.add(definition, value);
       }
       return value;
     } catch (RuntimeException | Error e) {
@@ -105,25 +90,20 @@ private Worker worker() {
     return worker;
   }
 
+  /** Closes the test fixtures and returns the worker; a failure to close any of them fails the test. */
   @Override
-  public void close() {
-    for (int i = created.size() - 1; i >= 0; i--) {
-      Entry entry = created.get(i);
-      try {
-        entry.definition.close(entry.value);
-      } catch (Throwable e) {
-        System.err.println("Failed to close " + entry.definition.describe() + ": " + e);
-      }
-    }
-    created.clear();
-    values.clear();
+  public void close() throws Exception {
+    Teardown teardown = new Teardown();
+    values.close(teardown);
     if (worker != null) {
       // Like Playwright Test, do not reuse a worker after a failure: the test may have left the
       // browser or the Playwright instance in an unknown state.
-      boolean failed = context.getExecutionException().filter(e -> !(e instanceof TestAbortedException)).isPresent();
-      WorkerPool.INSTANCE.release(worker, failed);
+      boolean discard = teardown.failed()
+        || context.getExecutionException().filter(e -> !(e instanceof TestAbortedException)).isPresent();
+      teardown.run(() -> WorkerPool.INSTANCE.release(worker, discard));
       worker = null;
     }
+    teardown.rethrow();
   }
 
   private final class Resolver implements FixtureResolver {
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java
index 04a34bc76..dc60ee55a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerFixtures.java
@@ -17,23 +17,38 @@
 package com.microsoft.playwright.fixtures;
 
 import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
 import com.microsoft.playwright.BrowserType;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.parallel.Isolated;
 
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
 
+// Runs alone so that no other test class can evict the workers whose reuse it checks.
+@Isolated
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestWorkerFixtures {
-  private static final AtomicInteger created = new AtomicInteger();
+  private static final Map<BrowserName, Set<WorkerResource>> resourcesByBrowser = new ConcurrentHashMap<>();
   private static final AtomicInteger closed = new AtomicInteger();
 
   static final class WorkerResource implements AutoCloseable {
     final Browser browser;
+    // Created by a worker fixture, so it is kept open from one test to the next.
+    final BrowserContext context;
 
     WorkerResource(Browser browser) {
       this.browser = browser;
-      created.incrementAndGet();
+      this.context = browser.newContext();
     }
 
     @Override
@@ -53,23 +68,33 @@ static WorkerResource workerResource(Browser browser) {
     return new WorkerResource(browser);
   }
 
+  private static void record(BrowserName browserName, WorkerResource resource) {
+    resourcesByBrowser.computeIfAbsent(browserName, k -> new HashSet<>()).add(resource);
+  }
+
   @AfterAll
-  static void workerResourcesOutliveTests() {
-    // Worker fixtures are closed with their worker, which the pool may evict while other classes
-    // run, never once per test.
-    assertTrue(created.get() > 0);
-    assertTrue(closed.get() <= created.get(), "created " + created.get() + ", closed " + closed.get());
+  static void workerFixturesAreSharedByTests() {
+    resourcesByBrowser.forEach((browserName, resources) ->
+      assertEquals(1, resources.size(), browserName + " tests did not share the worker: " + resources));
+    assertEquals(0, closed.get(), "Worker fixtures were closed while their worker was idle");
   }
 
   @PlaywrightTest
-  void shouldLaunchWithOverriddenOptions(BrowserType.LaunchOptions launchOptions, Browser browser, WorkerResource resource) {
+  @Order(1)
+  void shouldLaunchWithOverriddenOptions(BrowserType.LaunchOptions launchOptions, Browser browser, WorkerResource resource, BrowserName browserName) {
+    record(browserName, resource);
     assertEquals(123456, launchOptions.timeout);
     assertTrue(browser.isConnected());
     assertSame(browser, resource.browser);
+    // Left open on purpose: it must be closed before the next test gets this worker.
+    browser.newContext();
   }
 
   @PlaywrightTest
-  void shouldReuseWorkerFixtures(Browser browser, WorkerResource resource) {
+  @Order(2)
+  void shouldReuseWorkerFixtures(Browser browser, WorkerResource resource, BrowserName browserName) {
+    record(browserName, resource);
     assertSame(browser, resource.browser);
+    assertEquals(singletonList(resource.context), browser.contexts());
   }
 }
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerPool.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerPool.java
new file mode 100644
index 000000000..6fab1bcd7
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/TestWorkerPool.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.fixtures;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestWorkerPool {
+  private static final Worker.Key CHROMIUM = new Worker.Key(BrowserName.CHROMIUM, Collections.emptyList());
+  private static final Worker.Key FIREFOX = new Worker.Key(BrowserName.FIREFOX, Collections.emptyList());
+  private static final Worker.Key WEBKIT = new Worker.Key(BrowserName.WEBKIT, Collections.emptyList());
+
+  // Idle workers are closed concurrently at the end of the run.
+  private final List<Object> closed = Collections.synchronizedList(new ArrayList<>());
+  private final FixtureDefinition resource = new WorkerFixture("resource", null);
+
+  /** A worker fixture whose values record that they were closed, or fail to close. */
+  private final class WorkerFixture implements FixtureDefinition {
+    private final String name;
+    private final String closeError;
+
+    WorkerFixture(String name, String closeError) {
+      this.name = name;
+      this.closeError = closeError;
+    }
+
+    @Override
+    public Class<?> type() {
+      return Object.class;
+    }
+
+    @Override
+    public Scope scope() {
+      return Scope.WORKER;
+    }
+
+    @Override
+    public Object identity() {
+      return this;
+    }
+
+    @Override
+    public Object create(FixtureResolver resolver) {
+      return new Object();
+    }
+
+    @Override
+    public void close(Object value) {
+      if (closeError != null) {
+        throw new IllegalStateException(closeError);
+      }
+      closed.add(value);
+    }
+
+    @Override
+    public String describe() {
+      return name;
+    }
+  }
+
+  @Test
+  void shouldKeepWorkerPerBrowserWhenEachTestRunsInAllBrowsers() throws Exception {
+    // One test thread, every test runs in three browsers one after another.
+    WorkerPool pool = new WorkerPool(() -> 3);
+    Map<Worker.Key, Worker> firstWorkers = new HashMap<>();
+    for (int test = 0; test < 3; test++) {
+      for (Worker.Key key : asList(CHROMIUM, FIREFOX, WEBKIT)) {
+        Worker worker = pool.acquire(key);
+        worker.get(resource, null);
+        firstWorkers.putIfAbsent(key, worker);
+        assertSame(firstWorkers.get(key), worker, "test " + test + " in " + key);
+        pool.release(worker, false);
+      }
+    }
+    assertEquals(asList(), closed);
+  }
+
+  @Test
+  void shouldEvictLeastRecentlyReleasedWorkerWhenFull() throws Exception {
+    WorkerPool pool = new WorkerPool(() -> 2);
+    Worker chromium = pool.acquire(CHROMIUM);
+    Object chromiumValue = chromium.get(resource, null);
+    pool.release(chromium, false);
+    Worker firefox = pool.acquire(FIREFOX);
+    pool.release(firefox, false);
+
+    Worker webkit = pool.acquire(WEBKIT);
+    assertEquals(asList(chromiumValue), closed);
+    pool.release(webkit, false);
+    assertSame(firefox, pool.acquire(FIREFOX));
+  }
+
+  @Test
+  void shouldReportFailureToCloseEvictedWorkerAtEndOfRun() throws Exception {
+    WorkerPool pool = new WorkerPool(() -> 1);
+    Worker chromium = pool.acquire(CHROMIUM);
+    chromium.get(new WorkerFixture("broken", "broken failed"), null);
+    pool.release(chromium, false);
+
+    // No test owns the evicted worker, so the test that needs its room still gets a worker.
+    Worker firefox = pool.acquire(FIREFOX);
+    pool.release(firefox, false);
+
+    IllegalStateException e = assertThrows(IllegalStateException.class, pool::closeAll);
+    assertEquals("Failed to close " + chromium, e.getMessage());
+    assertEquals("broken failed", e.getCause().getMessage());
+  }
+
+  @Test
+  void shouldCloseWorkerAfterFailedTest() throws Exception {
+    WorkerPool pool = new WorkerPool(() -> 1);
+    Worker worker = pool.acquire(CHROMIUM);
+    Object value = worker.get(resource, null);
+    pool.release(worker, true);
+
+    assertEquals(asList(value), closed);
+    assertNotSame(worker, pool.acquire(CHROMIUM));
+  }
+
+  @Test
+  void shouldCloseEverythingAndReportAllTeardownFailures() throws Exception {
+    WorkerPool pool = new WorkerPool(() -> 1);
+    Worker worker = pool.acquire(CHROMIUM);
+    Object value = worker.get(resource, null);
+    worker.get(new WorkerFixture("first", "first failed"), null);
+    worker.get(new WorkerFixture("second", "second failed"), null);
+
+    // Closed newest first: both failures are reported and the oldest value is still closed.
+    IllegalStateException e = assertThrows(IllegalStateException.class, () -> pool.release(worker, true));
+    assertEquals("second failed", e.getMessage());
+    assertEquals(1, e.getSuppressed().length);
+    assertEquals("first failed", e.getSuppressed()[0].getMessage());
+    assertEquals(asList(value), closed);
+  }
+
+  @Test
+  void shouldCloseIdleWorkersAtEndOfRun() throws Exception {
+    WorkerPool pool = new WorkerPool(() -> 3);
+    Worker chromium = pool.acquire(CHROMIUM);
+    Object chromiumValue = chromium.get(resource, null);
+    Worker firefox = pool.acquire(FIREFOX);
+    Object firefoxValue = firefox.get(resource, null);
+    firefox.get(new WorkerFixture("broken", "broken failed"), null);
+    pool.release(chromium, false);
+    pool.release(firefox, false);
+
+    IllegalStateException e = assertThrows(IllegalStateException.class, pool::closeAll);
+    assertEquals("Failed to close " + firefox, e.getMessage());
+    assertEquals("broken failed", e.getCause().getMessage());
+    assertEquals(new HashSet<>(asList(chromiumValue, firefoxValue)), new HashSet<>(closed));
+  }
+}
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java
index 85b361ba4..7c8b6de9e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/Worker.java
@@ -17,12 +17,12 @@
 package com.microsoft.playwright.fixtures;
 
 import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.BrowserContext;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 /**
  * A bundle of worker-scoped fixture values, the counterpart of a Playwright Test worker process.
@@ -60,56 +60,64 @@ public String toString() {
     }
   }
 
-  private static final class Entry {
-    final FixtureDefinition definition;
-    final Object value;
-
-    Entry(FixtureDefinition definition, Object value) {
-      this.definition = definition;
-      this.value = value;
-    }
-  }
-
   final Key key;
-  private final Map<Object, Object> values = new HashMap<>();
-  private final List<Entry> created = new ArrayList<>();
+  private final FixtureValues values = new FixtureValues();
+  // Contexts created by worker fixtures. They belong to the worker and outlive tests.
+  private final Set<BrowserContext> workerContexts = new HashSet<>();
 
   Worker(Key key) {
     this.key = key;
-    values.put(BuiltinFixture.BROWSER_NAME.identity(), key.browserName);
+    values.add(BuiltinFixture.BROWSER_NAME, key.browserName);
   }
 
   Object get(FixtureDefinition definition, FixtureResolver resolver) throws Exception {
-    Object value = values.get(definition.identity());
+    Object value = values.get(definition);
     if (value == null) {
+      Set<BrowserContext> before = contexts();
       value = definition.create(resolver);
       if (value == null) {
         throw new IllegalStateException(definition.describe() + " returned null");
       }
-      values.put(definition.identity(), value);
-      created.add(new Entry(definition, value));
+      values.add(definition, value);
+      Set<BrowserContext> created = contexts();
+      created.removeAll(before);
+      workerContexts.addAll(created);
     }
     return value;
   }
 
+  /**
+   * Closes the contexts that the last test opened in this worker's browsers and left behind, so
+   * that the next test starts with only the contexts of the worker fixtures.
+   */
+  void closeTestContexts(Teardown teardown) {
+    Set<BrowserContext> leaked = contexts();
+    leaked.removeAll(workerContexts);
+    for (BrowserContext context : leaked) {
+      teardown.run(context::close);
+    }
+  }
+
+  private Set<BrowserContext> contexts() {
+    Set<BrowserContext> result = new HashSet<>();
+    for (Browser browser : values.ofType(Browser.class)) {
+      if (browser.isConnected()) {
+        result.addAll(browser.contexts());
+      }
+    }
+    return result;
+  }
+
   /** A worker whose browser got disconnected cannot serve another test. */
   boolean isHealthy() {
-    Object browser = values.get(BuiltinFixture.BROWSER.identity());
-    return browser == null || ((Browser) browser).isConnected();
+    return values.ofType(Browser.class).stream().allMatch(Browser::isConnected);
   }
 
   @Override
-  public void close() {
-    for (int i = created.size() - 1; i >= 0; i--) {
-      Entry entry = created.get(i);
-      try {
-        entry.definition.close(entry.value);
-      } catch (Throwable e) {
-        System.err.println("Failed to close " + entry.definition.describe() + ": " + e);
-      }
-    }
-    created.clear();
-    values.clear();
+  public void close() throws Exception {
+    Teardown teardown = new Teardown();
+    values.close(teardown);
+    teardown.rethrow();
   }
 
   @Override
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java
index 4a4bf3a04..9e7f0c5f8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/WorkerPool.java
@@ -19,22 +19,32 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.function.IntSupplier;
 
 /**
  * Hands out {@link Worker}s to tests. Idle workers are kept for the next test with the same key;
- * when the pool is full, the least recently used idle worker with a different key is closed to
- * make room, as Playwright Test tears a worker down when the next test needs different worker
- * fixtures. Workers are not bound to threads, so the pool is safe with JUnit's fork-join
- * executor which may add compensation threads or retire idle ones.
+ * when the pool is full, the least recently used idle worker is closed to make room, as Playwright
+ * Test tears a worker down when the next test needs different worker fixtures. Workers are not
+ * bound to threads, so the pool is safe with JUnit's fork-join executor which may add compensation
+ * threads or retire idle ones.
  */
 final class WorkerPool {
-  static final WorkerPool INSTANCE = new WorkerPool();
+  /**
+   * Every test thread runs each test once per browser, one invocation after another, so it needs
+   * a worker per browser to reuse them from one test to the next.
+   */
+  static final WorkerPool INSTANCE = new WorkerPool(() -> testThreads() * Env.browserNames().size());
 
+  private final IntSupplier capacity;
   // Least recently released first.
   private final List<Worker> idle = new ArrayList<>();
   private int busy;
+  // Failures to close workers that no test owns: evicted ones and the idle ones at the end of the run.
+  // Like Playwright Test's worker teardown errors, they are reported for the whole run.
+  private final Teardown unownedTeardown = new Teardown();
 
-  private WorkerPool() {
+  WorkerPool(IntSupplier capacity) {
+    this.capacity = capacity;
   }
 
   Worker acquire(Worker.Key key) {
@@ -46,43 +56,63 @@ Worker acquire(Worker.Key key) {
           return idle.remove(i);
         }
       }
-      if (!idle.isEmpty() && idle.size() + busy >= maxWorkers()) {
+      if (!idle.isEmpty() && idle.size() + busy >= capacity.getAsInt()) {
         evicted = idle.remove(0);
       }
       busy++;
     }
     if (evicted != null) {
-      evicted.close();
+      closeUnowned(evicted);
     }
     return new Worker(key);
   }
 
-  void release(Worker worker, boolean discard) {
-    boolean close = discard || !worker.isHealthy();
+  /**
+   * Returns the worker to the pool once it is ready for the next test, or closes it when it must
+   * not serve another one; failures to clean it up are reported to the test that used it.
+   */
+  void release(Worker worker, boolean discard) throws Exception {
+    Teardown teardown = new Teardown();
+    boolean reuse = !discard && worker.isHealthy();
+    if (reuse) {
+      worker.closeTestContexts(teardown);
+      reuse = !teardown.failed();
+    }
     synchronized (this) {
       busy--;
-      if (!close) {
+      if (reuse) {
         idle.add(worker);
       }
     }
-    if (close) {
-      worker.close();
+    if (!reuse) {
+      teardown.run(worker::close);
     }
+    teardown.rethrow();
   }
 
-  void closeAll() {
+  void closeAll() throws Exception {
     List<Worker> workers;
     synchronized (this) {
       workers = new ArrayList<>(idle);
       idle.clear();
     }
-    for (Worker worker : workers) {
-      worker.close();
-    }
+    // Workers share nothing, so they are closed concurrently.
+    workers.parallelStream().forEach(this::closeUnowned);
+    unownedTeardown.rethrow();
+  }
+
+  private void closeUnowned(Worker worker) {
+    unownedTeardown.run(() -> {
+      try {
+        worker.close();
+      } catch (Exception e) {
+        throw new IllegalStateException("Failed to close " + worker, e);
+      }
+    });
   }
 
-  /** As many workers as there are test threads; one when tests do not run in parallel. */
-  private static int maxWorkers() {
+  /** As many as JUnit runs tests in parallel; one when tests do not run in parallel. */
+  private static int testThreads() {
     Thread thread = Thread.currentThread();
     if (thread instanceof ForkJoinWorkerThread) {
       return ((ForkJoinWorkerThread) thread).getPool().getParallelism();
diff --git a/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java b/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java
index 76faa445d..e14932dde 100644
--- a/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java
+++ b/playwright/src/test/java/com/microsoft/playwright/fixtures/package-info.java
@@ -29,7 +29,8 @@
  *   <li>Worker fixtures ({@code scope: 'worker'}) are {@link com.microsoft.playwright.fixtures.Scope#WORKER}
  *       fixtures. A worker is a bundle of such values that one test uses at a time; the pool hands it to
  *       the next test with the same worker fixtures and closes it after a failure, as Playwright Test
- *       restarts a worker process.</li>
+ *       restarts a worker process. Contexts that a test leaves open in a worker's browsers are closed
+ *       when the test ends; contexts created by worker fixtures stay open.</li>
  *   <li>{@code test.skip(({ browserName }) => ...)} is {@link com.microsoft.playwright.fixtures.DisabledOnBrowser}
  *       or {@link com.microsoft.playwright.fixtures.EnabledOnBrowser}; dynamic conditions use JUnit assumptions.</li>
  *   <li>Tests generated in a {@code for} loop are a {@code @Nested @ParameterizedClass} whose
@@ -40,6 +41,9 @@
  * Playwright objects are not thread-safe, so every worker is used by a single test at a time and tests
  * only touch the fixtures they were given. Workers are pooled rather than bound to threads because
  * JUnit's fork-join executor may add or retire threads; sequential use from different threads is safe.
+ * Each test thread runs a test in every browser one after another, so the pool keeps a worker per
+ * browser for every thread. Errors while closing fixtures fail the test that used them, or the whole
+ * run for idle workers that no test owns.
  *
  * <h2>Other extensions</h2>
  * The resolver only claims parameters whose type is a known fixture, so it coexists with the parameter