diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5e049f7..e31357d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -41,9 +41,14 @@ jobs:
           java-version: ${{ matrix.jdkver}}
       - name: Run
         run: ./run.sh "${JAVA_HOME}"
+      - name: Upload results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          path: "test.*.tar.gz"
 
   test-macos:
-    name: "MacOS"
+    name: "MacOS Jtreg"
     runs-on: "macos-latest"
     strategy:
       fail-fast: false
@@ -53,7 +58,6 @@ jobs:
           - JDK 11
           - JDK 17
           - JDK 21
-          - JDK Latest
         include:
           - jdkconf: JDK 8
             jdkver: "8"
@@ -63,8 +67,6 @@ jobs:
             jdkver: "17"
           - jdkconf: JDK 21
             jdkver: "21"
-          - jdkconf: JDK Latest
-            jdkver: "21"
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK
@@ -74,4 +76,44 @@ jobs:
           java-version: ${{ matrix.jdkver}}
       - name: Run
         run: ./run.sh "${JAVA_HOME}"
+      - name: Upload results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          path: "test.*.tar.gz"
+
+  test-windows:
+    name: "Windows Jtreg"
+    runs-on: "windows-latest"
+    strategy:
+      fail-fast: false
+      matrix:
+        jdkconf:
+          - JDK 8
+          - JDK 11
+          - JDK 17
+          - JDK 21
+        include:
+          - jdkconf: JDK 8
+            jdkver: "8"
+          - jdkconf: JDK 11
+            jdkver: "11"
+          - jdkconf: JDK 17
+            jdkver: "17"
+          - jdkconf: JDK 21
+            jdkver: "21"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: wget tar
+      - name: Prepare env
+        shell: msys2 {0}
+        run: ./run.sh "${JAVA_HOME}"
+      - name: Upload results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          path: "test.*.tar.gz"