diff --git a/.appveyor.yml b/.appveyor.yml
index 27eaaa79..f4e272d8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,84 +1,37 @@
 clone_folder: c:\dev\glm-cmake
 
-environment:
-  matrix:
-    os: Visual Studio 2013
-      - platform: x86
-        configuration: Release
-        build_script:
-          - md build32_pure_98_release
-          - cd build32_pure_98_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON ..
-          - cmake -E time cmake --build . --config Release
+image:
+- Visual Studio 2013
+- Visual Studio 2015
+- Visual Studio 2017
+configuration:
+- Release
+- Debug
+platform:
+- x64
 
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_pure_98_release
-          - cd build64_pure_98_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON ..
-          - cmake -E time cmake --build . --config Release
+init:
+- set arch=
+- if "%arch%"=="Win64" ( set arch= Win64)
+- echo %arch%
+- echo %APPVEYOR_BUILD_WORKER_IMAGE%
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017%arch%" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015%arch%" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set generator="Visual Studio 12 2013%arch%" )
+- echo %generator%
 
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_pure_ms_release
-          - cd build64_pure_ms_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_FORCE_PURE=ON ..
-          - cmake -E time cmake --build . --config Release
+before_build:
+- cmd: |-
+    mkdir build
+    cd build
+    cmake --version
+    cmake .. -G %generator%
 
-    os: Visual Studio 2015
-      - platform: x64
-        configuration: Debug
-        build_script:
-          - md build_pure_11_debug
-          - cd build_pure_11_debug
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON ..
-          - cmake -E time cmake --build . --config Debug
-
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_pure_11_release
-          - cd build64_pure_11_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON ..
-          - cmake -E time cmake --build . --config Release
-
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_sse3_11_release
-          - cd build64_sse3_11_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON ..
-          - cmake -E time cmake --build . --config Release
-
-    os: Visual Studio 2017
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_pure_14_release
-          - cd build64_pure_14_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON ..
-          - cmake -E time cmake --build . --config Release
-
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_sse3_14_release
-          - cd build64_sse3_14_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON ..
-          - cmake -E time cmake --build . --config Release
-
-    os: Visual Studio 2017
-      - platform: x64
-        configuration: Release
-        build_script:
-          - md build64_avx_14_release
-          - cd build64_avx_14_release
-          - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
-          - cmake -E time cmake --build . --config Release
+build:
+  project: c:\dev\glm-cmake\build\template.sln
+  verbosity: minimal
+  parallel: true
 
 after_build:
-  - cd ..
   - ctest