diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 47b2688c..d50fb571 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -24,27 +24,35 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
-          - macos-13
           - ubuntu-latest
+          - macos-latest # testing limited to latest Java LTS
+          - windows-latest # testing limited to latest Java LTS
         test-java-version:
           - 8
           - 11
           - 17
           - 21
           - 25 # renovate(java-version)
-        # macos-latest drops support for java 8 temurin. Run java 8 on macos-13. Run java 11+ on macos-latest.
         exclude:
           - os: macos-latest
             test-java-version: 8
-          - os: macos-13
+          - os: macos-latest
+            test-java-version: 11
+          - os: macos-latest
+            test-java-version: 17
+          - os: macos-latest
+            test-java-version: 21
+          - os: windows-latest
+            test-java-version: 8
+          - os: windows-latest
             test-java-version: 11
-          - os: macos-13
+          - os: windows-latest
             test-java-version: 17
-          - os: macos-13
+          - os: windows-latest
             test-java-version: 21
-          - os: macos-13
-            test-java-version: 25 # renovate(java-version)
+    defaults:
+      run:
+        shell: bash # Use bash shell on all OSes for consistency
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -70,7 +78,7 @@ jobs:
           ./gradlew
           build
           -PtestJavaVersion=${{ matrix.test-java-version }}
-          -Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}
+          "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}"
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: generate