diff --git a/.travis.yml b/.travis.yml
index 6054abbb4..40aa8b656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,26 +23,31 @@ jobs:
       script:
         - autoconf
         - ./configure --prefix=$HOME
-        - make
         - make install
+        - make check
         - cd ivtest
         - perl vvp_reg.pl
+        - diff regression_report-devel.txt regression_report.txt
+        - perl vpi_reg.pl
 
     - stage: Test
       os: windows
       before_install:
         - git clone https://github.com/steveicarus/ivtest.git
-        - export PATH=$HOME/bin:$PATH
-        - PowerShell -Command "Invoke-WebRequest -outfile 7zsetup.exe http://www.7-zip.org/a/7z1604-x64.exe"
-        - PowerShell -Command "Invoke-WebRequest -outfile msys2-x86_64-latest.tar.xz http://repo.msys2.org/distrib/msys2-x86_64-latest.tar.xz"
-        - PowerShell -Command "Start-Process .\7zsetup -ArgumentList '/S /D=c:/7zip' -Wait"
-        - PowerShell -Command "C:\7zip\7z e msys2-x86_64-latest.tar.xz -Wait"
-        - PowerShell -Command "C:\7zip\7z x msys2-x86_64-latest.tar -oC:\\"
-        - PowerShell -Command "C:\msys64\usr\bin\bash -lc 'pacman --noconfirm -S  base-devel mingw-w64-x86_64-toolchain'"
+        - choco uninstall -y mingw
+        - choco upgrade --no-progress -y msys2
+        - export msys2='cmd //C RefreshEnv.cmd '
+        - export msys2+='& set MSYS=winsymlinks:nativestrict '
+        - export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
+        - export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
+        - export msys2+=" -msys2 -c "\"\$@"\" --"
+        - $msys2 pacman --sync --noconfirm --needed base-devel mingw-w64-x86_64-toolchain
       script:
-        - PowerShell -Command "C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -lc './autoconf.sh'"
-        - PowerShell -Command "C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -lc './configure --prefix=/usr'"
-        - PowerShell -Command "C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -lc 'make'"
-        - PowerShell -Command "C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -lc 'make install'"
-        - PowerShell -Command "C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -lc 'iverilog -h'"
-        - PowerShell -Command "C:\msys64\msys2_shell.cmd -defterm -no-start -mingw64 -lc 'cd $TRAVIS_BUILD_DIR/ivtest; perl vvp_reg.pl'"
+        - $mingw64 ./autoconf.sh
+        - $mingw64 ./configure
+        - $mingw64 make install
+        - $mingw64 make check
+        - cd ivtest
+        - $mingw64 perl vvp_reg.pl
+        - diff regression_report-msys2.txt regression_report.txt
+        - $mingw64 perl vpi_reg.pl