diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 94aa79d0ed6be..67cf0498bcf10 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -15,10 +15,18 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, windows-2022]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout Repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - name: Setup Java
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
+      with:
+        distribution: temurin
+        java-version: 21
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
     - name: Build all classes
@@ -43,11 +51,19 @@ jobs:
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3
   test:
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, windows-2022]
+    runs-on: ${{ matrix.os }}
     needs: build
-    runs-on: ubuntu-24.04
     steps:
     - name: Checkout Repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - name: Setup Java
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
+      with:
+        distribution: temurin
+        java-version: 21
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
     - name: Run unit tests
@@ -61,7 +77,7 @@ jobs:
       uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        flags: test
+        flags: test-${{ matrix.os }}
   funTest-non-docker:
     needs: build
     runs-on: ubuntu-24.04