diff --git a/appveyor.yml b/appveyor.yml
index 73f61c472..15ae81857 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,17 +7,6 @@ matrix:
 
 environment:
   matrix:
-    - VisualStudioVersion: 12.0
-      platform: Win32
-      configuration: Debug
-      vcvarsall_platform: x86
-      PlatformToolset: v120
-    - VisualStudioVersion: 12.0
-      platform: Win32
-      configuration: Release
-      vcvarsall_platform: x86
-      PlatformToolset: v120
-      MYQTDIR: C:\Qt\5.6\msvc2013
     - VisualStudioVersion: 12.0
       platform: x64
       configuration: Debug
@@ -32,17 +21,6 @@ environment:
       MYQTDIR: C:\Qt\5.6\msvc2013_64
 # FIXME: These are disabled for now. They were broken by ae8653612802b41b70424ec9a5eefe8a1178f6d1
 #    - VisualStudioVersion: 14.0
-#      platform: Win32
-#      configuration: Debug
-#      vcvarsall_platform: x86
-#      PlatformToolset: v140
-#    - VisualStudioVersion: 14.0
-#      platform: Win32
-#      configuration: Release
-#      vcvarsall_platform: x86
-#      PlatformToolset: v140
-#      MYQTDIR: C:\Qt\5.11\msvc2015
-#    - VisualStudioVersion: 14.0
 #      platform: x64
 #      configuration: Debug
 #      vcvarsall_platform: x64
@@ -58,8 +36,7 @@ environment:
 install:
   - python -m pip install --user pip --upgrade
   - python -m pip install --user pytest
-  - SET p=x86
-  - IF "%platform%"=="x64" SET p=x64
+  - SET p=x64
   - curl -fsSL https://github.com/Z3Prover/z3/releases/download/z3-4.8.9/z3-4.8.9-%p%-win.zip -o z3-4.8.9-win.zip
   - 7z x z3-4.8.9-win.zip -oexternals -r -y
   - move externals\z3-4.8.9-%p%-win externals\z3
@@ -94,7 +71,7 @@ test_script:
   - python -m pytest test-inline-suppress.py
   - python -m pytest test-proj2.py
   - python -m pytest test-suppress-syntaxError.py
-  - 'IF defined cygwin_build C:\cygwin64\bin\bash -e -l -c "cd /cygdrive/c/projects/cppcheck && make clean && make -j 2 && make test && make checkcfg"'
+  - 'IF defined cygwin_build C:\cygwin64\bin\bash -e -l -c "cd /cygdrive/c/projects/cppcheck && make clean && make -j 2 test checkcfg"'
 
 artifacts:
   - path: bin