diff --git a/.appveyor_msys_build.sh b/.appveyor_msys_build.sh
index ef4d2248..e8ee9e6d 100644
--- a/.appveyor_msys_build.sh
+++ b/.appveyor_msys_build.sh
@@ -1,9 +1,5 @@
-export PATH=/c/msys64/mingw$ABI/bin:$PATH
+export PATH=/c/msys64/mingw$ABI/bin:/c/projects/mpir/bin/:$PATH
 cd /c/projects/mpir
-./configure ABI=$ABI
+./configure ABI=$ABI --with-system-yasm
 make
-if [ "$ABI" = "32" ]
-then
-    rm yasm/Makefile
-fi
 make check
diff --git a/appveyor.yml b/appveyor.yml
index 8b147f89..d4710463 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,16 +4,16 @@ build:
   
 environment:
   matrix:
+    - COMPILER: MinGW-w64
+      ABI: 32
+    - COMPILER: MinGW-w64
+      ABI: 64
     - BUILD_TYPE: Release
       COMPILER: MSVC15
       PLATFORM: x64
     - BUILD_TYPE: Release
       COMPILER: MSVC15
       PLATFORM: Win32
-    - COMPILER: MinGW-w64
-      ABI: 64
-    - COMPILER: MinGW-w64
-      ABI: 32
 #    - BUILD_TYPE: Debug
 #      COMPILER: MSVC15
 #      PLATFORM: x64
@@ -22,6 +22,7 @@ environment:
 #      PLATFORM: Win32
  
 build_script:
+  - if [%COMPILER%]==[MinGW-w64] mkdir bin && cd bin\ && appveyor DownloadFile http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe -fileName yasm.exe
   - if [%COMPILER%]==[MinGW-w64] C:\msys64\usr\bin\sh.exe --login /c/projects/mpir/.appveyor_msys_build.sh
   - if [%COMPILER%]==[MSVC15] cd build.vc14
   - if [%COMPILER%]==[MSVC15] msbuild.bat gc lib %PLATFORM% %BUILD_TYPE% +tests