diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eb84d57..0270eda 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -67,7 +67,7 @@ jobs:
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
           echo "JAVA_HOME: $env:JAVA_HOME"
           java --version
-          native-image.cmd --version
+          native-image --version
         if: runner.os == 'Windows'
   test-ee:
     name: EE ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
@@ -103,7 +103,7 @@ jobs:
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
           echo "JAVA_HOME: $env:JAVA_HOME"
           java --version
-          # native-image.cmd --version (activate after 22.1.0 is released)
+          # native-image --version (activate after 22.1.0 is released)
         if: runner.os == 'Windows'
   test-mandrel:
     name: ${{ matrix.version }} + JDK${{ matrix.java-version }} on ${{ matrix.os }}
@@ -134,7 +134,7 @@ jobs:
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
           echo "JAVA_HOME: $env:JAVA_HOME"
           java --version
-          native-image.cmd --version
+          native-image --version
         if: runner.os == 'Windows'
   test-native-image-msvc:
     name: native-image on windows-latest
@@ -151,9 +151,9 @@ jobs:
       - name: Build HelloWorld executable with GraalVM Native Image on Windows
         run: |
           echo 'public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, World!"); } }' > HelloWorld.java
-          javac.exe HelloWorld.java
-          native-image.cmd HelloWorld
-          ./helloworld.exe
+          javac HelloWorld.java
+          native-image HelloWorld
+          ./helloworld
   test-native-image-musl:
     name: native-image-musl on ubuntu-latest
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index b885c89..31009fa 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        version: [latest, dev, '22.0.0.2']
+        version: ['22.0.0.2', latest]
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v2
@@ -66,17 +66,10 @@ jobs:
 
       - name: Build and run HelloWorld.java
         run: |
+          echo 'public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, World!"); } }' > HelloWorld.java
           javac HelloWorld.java
           native-image HelloWorld
           ./helloworld
-        if: runner.os != 'Windows'
-      
-      - name: Build and run HelloWorld.java on Windows
-        run: |
-          javac.exe HelloWorld.java
-          native-image.cmd HelloWorld
-          ./helloworld.exe
-        if: runner.os == 'Windows'
       
       - name: Upload binary
         uses: actions/upload-artifact@v2