diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index e31357d..13dd9ad 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -85,6 +85,9 @@ jobs:
   test-windows:
     name: "Windows Jtreg"
     runs-on: "windows-latest"
+    defaults:
+      run:
+        shell: C:\tools\cygwin\bin\bash.exe --login -o igncr '{0}'
     strategy:
       fail-fast: false
       matrix:
@@ -104,16 +107,25 @@ jobs:
             jdkver: "21"
     steps:
       - uses: actions/checkout@v3
-      - uses: msys2/setup-msys2@v2
+      - name: Set up Cygwin
+        uses: egor-tensin/setup-cygwin@v4
         with:
-          update: true
-          install: wget tar
-      - name: Prepare env
-        shell: msys2 {0}
-        run: ./run.sh "${JAVA_HOME}"
+          packages: wget tar bash
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.jdkver}}
+      - name: Run
+        run: |
+             pwd
+             ls -l
+             cd /d/a/jtreg-buffer/jtreg-buffer
+             pwd
+             ls -l
+             ./run.sh "${JAVA_HOME}"
       - name: Upload results
         if: ${{ always() }}
         uses: actions/upload-artifact@v3
         with:
           path: "test.*.tar.gz"
-