diff --git a/appveyor.yml b/appveyor.yml
index aa27001..abef947 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,42 +1,87 @@
 version: '{branch}-{build}'
 
+clone_depth: 50
+
+branches:
+  only:
+    - master
+
+# Also includes VS2013 pre-installed
+image:
+  - Visual Studio 2015
+  - Visual Studio 2017
+
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      QTDIR: C:\Qt\5.13.0\msvc2017_64
-      VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"
-      PLATFORM:
-      VER_SUFFIX: win64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      QTDIR: C:\Qt\5.11\msvc2015
-      VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat"
-      PLATFORM: x86
-      VER_SUFFIX: win32
+    # Visual Studio 2013, 32-bit Release, Asio driver
+    - AUDIO_DRIVER: Asio
+      CONFIGURATION: Release
+      GENERATOR: Visual Studio 12 2013
+      QT_VERSION: 5.6
+      QT: msvc2013
+    # Visual Studio 2013, 64-bit Release, Asio driver
+    - AUDIO_DRIVER: Asio
+      CONFIGURATION: Release
+      GENERATOR: Visual Studio 12 2013 Win64
+      QT_VERSION: 5.10
+      QT: msvc2013_64
+    # Visual Studio 2013, 64-bit Debug, Wasapi driver
+    - AUDIO_DRIVER: Wasapi
+      CONFIGURATION: Debug
+      GENERATOR: Visual Studio 12 2013 Win64
+      QT_VERSION: 5.10
+      QT: msvc2013_64
+    # Visual Studio 2015, 32-bit Release, Asio driver
+    - AUDIO_DRIVER: Asio
+      CONFIGURATION: Release
+      GENERATOR: Visual Studio 14 2015
+      QT_VERSION: 5.10
+      QT: msvc2015
+    # Visual Studio 2015, 64-bit Debug, Asio driver
+    - AUDIO_DRIVER: Asio
+      CONFIGURATION: Debug
+      GENERATOR: Visual Studio 14 2015 Win64
+      QT_VERSION: 5.10
+      QT: msvc2015_64
+    # Visual Studio 2015, 64-bit Release, Asio driver
+    - AUDIO_DRIVER: Asio
+      CONFIGURATION: Release
+      GENERATOR: Visual Studio 14 2015 Win64
+      QT_VERSION: 5.10
+      QT: msvc2015_64
+    # Visual Studio 2015, 64-bit Release, Wasapi driver
+    - AUDIO_DRIVER: Wasapi
+      CONFIGURATION: Release
+      GENERATOR: Visual Studio 14 2015 Win64
+      QT_VERSION: 5.10
+      QT: msvc2015_64
+    # Visual Studio 2017, 64-bit Release, Asio driver
+    - AUDIO_DRIVER: Asio
+      CONFIGURATION: Release
+      GENERATOR: Visual Studio 15 2017 Win64
+      QT_VERSION: 5.10
+      QT: msvc2017_64
 
-    - QTDIR: C:\Qt\5.13.0\mingw73_64
-    - QTDIR: C:\Qt\5.13.0\mingw73_32
-    - QTDIR: C:\Qt\5.11.3\mingw53_32
+matrix:
+  exclude:
+    - image: Visual Studio 2015
+      GENERATOR: Visual Studio 15 2017 Win64
+    - image: Visual Studio 2017
+      GENERATOR: Visual Studio 12 2013
+    - image: Visual Studio 2017
+      GENERATOR: Visual Studio 12 2013 Win64
+    - image: Visual Studio 2017
+      GENERATOR: Visual Studio 14 2015
+    - image: Visual Studio 2017
+      GENERATOR: Visual Studio 14 2015 Win64
 
-configuration:
-  - debug
-  - release
-
-clone_script:
-  - cmd: git clone -q --recursive --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER%
-  - cmd: git checkout -qf %APPVEYOR_REPO_COMMIT%
 
 install:
-  - '%QTDIR%\bin\qtenv2.bat'
+  - git submodule update --init --recursive
+  - set PATH=%PATH%;C:\Qt\%QT_VERSION%\%QT%\bin
+  - call C:\Qt\%QT_VERSION%\%QT%\qtenv2.bat'
   - qmake -v
-  - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64
-  - if %QTDIR:msvc=%==%QTDIR% g++ --version
-  - if %QTDIR:msvc=%==%QTDIR% set make=mingw32-make.exe
-  - if %QTDIR:msvc=%==%QTDIR% %make% --version
-  - if not %QTDIR:msvc2013=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH%
-  - if not %QTDIR:msvc2015=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
-  - if not %QTDIR:msvc=%==%QTDIR% set make=nmake.exe
-  - if not %QTDIR:msvc=%==%QTDIR% %make% /? > nul
-
+  
 before_build:
   # Prepare the out-of-source build directory.
   - mkdir %APPVEYOR_BUILD_FOLDER%-build