diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
index 4ba6d9315011e..974deeaada5b0 100644
--- a/.github/workflows/ci-java.yml
+++ b/.github/workflows/ci-java.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  browser-tests:
+  browser-tests-windows:
     name: Browser Tests
     uses: ./.github/workflows/bazel.yml
     strategy:
@@ -13,6 +13,27 @@ jobs:
       matrix:
         include:
           - os: windows
+    with:
+      name: Browser Tests (chrome, ${{ matrix.os }})
+      os: ${{ matrix.os }}
+      browser: chrome
+      cache-key: java-${{ matrix.os }}-tests
+      run: |
+        bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest ^
+            //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest ^
+            //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest ^
+            //java/test/org/openqa/selenium/grid/gridui:OverallGridTest ^
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest ^
+            //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest ^
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
+
+  browser-tests-macos:
+    name: Browser Tests
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
           - os: macos
     with:
       name: Browser Tests (chrome, ${{ matrix.os }})
@@ -20,23 +41,13 @@ jobs:
       browser: chrome
       cache-key: java-${{ matrix.os }}-tests
       run: |
-        if [[ "${{ matrix.os }}" == "windows" ]]; then
-          bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest ^
-              //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest ^
-              //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest ^
-              //java/test/org/openqa/selenium/grid/gridui:OverallGridTest ^
-              //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest ^
-              //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest ^
-              //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
-        else
-          bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
-              //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest \
-              //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest \
-              //java/test/org/openqa/selenium/grid/gridui:OverallGridTest \
-              //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest \
-              //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest \
-              //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
-        fi
+        bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
+            //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest \
+            //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest \
+            //java/test/org/openqa/selenium/grid/gridui:OverallGridTest \
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest \
+            //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest \
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
 
   remote-tests:
     name: Remote Tests
@@ -45,7 +56,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows
           - os: macos
     with:
       name: Remote Tests (chrome, ${{ matrix.os }})
@@ -53,10 +63,5 @@ jobs:
       browser: chrome
       cache-key: java-${{ matrix.os }}-remote-tests
       run: |
-        if [[ "${{ matrix.os }}" == "windows" ]]; then
-          bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote ^
-              //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-remote
-        else
-          bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
-              //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-remote
-        fi
+        bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-remote