diff --git a/appveyor.yml b/appveyor.yml
index 7009699..90d7b20 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,17 +1,26 @@
-version: 1.0.{build}
 environment:
   matrix:
+    - TARGET: x86_64-pc-windows-gnu
+      BITS: 64
+      MSYS2: 1
     - TARGET: x86_64-pc-windows-msvc
-    - TARGET: i686-pc-windows-msvc
+      BITS: 64
     - TARGET: i686-pc-windows-gnu
+      BITS: 32
+      MSYS2: 1
+    - TARGET: i686-pc-windows-msvc
+      BITS: 32
 install:
-  - ps: >-
-      Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
-        - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-        - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
-        - SET PATH=%PATH%;C:\MinGW\bin
-        - rustc -V
-        - cargo -V
-build: off
+  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+  - rustup-init.exe -y --default-host %TARGET%
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - if defined MSYS2 set PATH=C:\msys64\mingw%BITS%\bin;%PATH%
+  - rustc -V
+  - cargo -V
+build: false
 test_script:
-  - ps: cargo test --verbose
\ No newline at end of file
+  - cargo build --verbose --all
+  - cargo test --verbose --all
+branches:
+  only:
+    - master
\ No newline at end of file