diff --git a/.appveyor.yml b/.appveyor.yml
index 646d9556..564a3c83 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,7 +37,7 @@ test_script:
 
 - ps: >-
 
-    if($env:BUILD_MODE -eq "CMake")
+    if($env:image -eq "Visual Studio 2017" && $env:BUILD_MODE -eq "CMake")
     {
 
         mkdir cmake-build
@@ -47,13 +47,71 @@ test_script:
         if($env:configuration -eq "Debug")
         {
 
-            cmake -G '"'$env:image'"' -DCMAKE_BUILD_TYPE=Debug ../
+            cmake -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Debug ../
 
         }
         else
         {
 
-            cmake -G '"'$env:image'"' -DCMAKE_BUILD_TYPE=Release ../
+            cmake -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release ../
+
+        }
+
+        msbuild /t:Build cryptopp-static.vcxproj
+
+        msbuild /t:Build cryptopp.vcxproj
+
+        .\cryptest.exe v
+
+        .\cryptest.exe tv all
+
+    }
+    elseif($env:image -eq "Visual Studio 2015" && $env:BUILD_MODE -eq "CMake")
+    {
+
+        mkdir cmake-build
+
+        cd cmake-build
+
+        if($env:configuration -eq "Debug")
+        {
+
+            cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=Debug ../
+
+        }
+        else
+        {
+
+            cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=Release ../
+
+        }
+
+        msbuild /t:Build cryptopp-static.vcxproj
+
+        msbuild /t:Build cryptopp.vcxproj
+
+        .\cryptest.exe v
+
+        .\cryptest.exe tv all
+
+    }
+    elseif($env:image -eq "Visual Studio 2013" && $env:BUILD_MODE -eq "CMake")
+    {
+
+        mkdir cmake-build
+
+        cd cmake-build
+
+        if($env:configuration -eq "Debug")
+        {
+
+            cmake -G "Visual Studio 12 2013" -DCMAKE_BUILD_TYPE=Debug ../
+
+        }
+        else
+        {
+
+            cmake -G "Visual Studio 12 2013" -DCMAKE_BUILD_TYPE=Release ../
 
         }