diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index becc14b..e3b7461 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -123,7 +123,7 @@ jobs:
              echo "it seems default shell do not honour -o igncr nor --norc"
              dos2unix -v run.sh
              find test -type f  -name "*.sh" -exec dos2unix -v {} \;
-             bash.exe --login --norc -o igncr -c "cd /cygdrive/d/a/jtreg-buffer/jtreg-buffer && ./run.sh \"${JAVA_HOME}\""
+             bash.exe --login --norc -o igncr -c "cd \"$GITHUB_WORKSPACE\" && ./run.sh \"${JAVA_HOME}\""
       - name: Upload results
         if: ${{ always() }}
         uses: actions/upload-artifact@v3
@@ -152,6 +152,11 @@ jobs:
             jdkver: "21"
     steps:
       - uses: actions/checkout@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.jdkver}}
       - uses: msys2/setup-msys2@v2
         with:
           update: true