diff --git a/.github/test.sh b/.github/test.sh
new file mode 100755
index 000000000..cb9e7c983
--- /dev/null
+++ b/.github/test.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+git clone https://github.com/steveicarus/ivtest.git
+cd ivtest
+
+if [ "$OS" = 'Windows_NT' ]; then
+  perl update_msys2_report.pl
+  perl vvp_reg.pl
+  diff --strip-trailing-cr regression_report-msys2.txt regression_report.txt
+else
+  perl vvp_reg.pl
+  diff regression_report-devel.txt regression_report.txt
+fi
+
+perl vpi_reg.pl
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d245ec90e..b62d8df78 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,18 +27,15 @@ jobs:
         sudo apt update -qq
         sudo apt install -y make g++ git bison flex gperf libreadline-dev autoconf
 
-    - name: Build and test
+    - name: Build
       run: |
-        git clone https://github.com/steveicarus/ivtest.git
-        export PATH=$HOME/bin:$PATH
         autoconf
-        ./configure --prefix=$HOME
-        make install
+        ./configure
+        sudo make install
         make check
-        cd ivtest
-        perl vvp_reg.pl
-        diff regression_report-devel.txt regression_report.txt
-        perl vpi_reg.pl
+
+    - name: Test
+      run: ./.github/test.sh
 
 
   win:
@@ -62,20 +59,11 @@ jobs:
     - name: Build and test
       shell: bash
       run: |
-        git clone https://github.com/steveicarus/ivtest.git
-
-        export msys2='cmd //C RefreshEnv.cmd '
-        export msys2+='& set MSYS=winsymlinks:nativestrict '
-        export msys2+='& C:\\msys64\\msys2_shell.cmd -defterm -no-start'
-        export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
-        export msys2+=" -msys2 -c "\"\$@"\" --"
+        export mingw64='cmd //C RefreshEnv.cmd & set MSYS=winsymlinks:nativestrict & C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --'
 
         $mingw64 ./autoconf.sh
         $mingw64 ./configure
         $mingw64 make install
         $mingw64 make check
-        cd ivtest
-        $mingw64 perl update_msys2_report.pl
-        $mingw64 perl vvp_reg.pl
-        diff --strip-trailing-cr regression_report-msys2.txt regression_report.txt
-        $mingw64 perl vpi_reg.pl
+
+        $mingw64 ./.github/test.sh