diff --git a/appveyor.yml b/appveyor.yml
index 584bd6bdb..2a389ace5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,36 +4,36 @@ clone_depth: 10
 
 environment:
   matrix:
-    - VisualStudioVersion: 10.0
+    - VisualStudioVersion: 12.0
       platform: "Win32"
       configuration: "Debug"
       vcvarsall_platform: "x86"
-      PlatformToolset: "v100"
-    - VisualStudioVersion: 10.0
+      PlatformToolset: "v120"
+    - VisualStudioVersion: 12.0
       platform: "Win32"
       configuration: "Release"
       vcvarsall_platform: "x86"
-      PlatformToolset: "v100"
-    - VisualStudioVersion: 10.0
+      PlatformToolset: "v120"
+    - VisualStudioVersion: 12.0
       platform: "x64"
       configuration: "Debug"
       vcvarsall_platform: "x64"
-      PlatformToolset: "v100"
-    - VisualStudioVersion: 10.0
+      PlatformToolset: "v120"
+    - VisualStudioVersion: 12.0
       platform: "x64"
       configuration: "Release"
       vcvarsall_platform: "x64"
-      PlatformToolset: "v100"
-    - VisualStudioVersion: 14.0
+      PlatformToolset: "v120"
+    - VisualStudioVersion: 15.0
       platform: "Win32"
       configuration: "Debug"
       vcvarsall_platform: "x86"
-      PlatformToolset: "v140"
-    - VisualStudioVersion: 14.0
+      PlatformToolset: "v141"
+    - VisualStudioVersion: 15.0
       platform: "x64"
       configuration: "Debug"
       vcvarsall_platform: "x64"
-      PlatformToolset: "v140"
+      PlatformToolset: "v141"
 
 build_script:
   - ECHO Building %configuration% %platform% with MSVC %VisualStudioVersion% using %PlatformToolset% PlatformToolset
diff --git a/cli/main.cpp b/cli/main.cpp
index f493903bb..f59513195 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -150,14 +150,14 @@ int main(int argc, char* argv[])
 // Warn about deprecated compilers
 #ifdef __clang__
 #   if ( __clang_major__ < 2 || ( __clang_major__  == 2 && __clang_minor__ < 9))
-#       warning "Using Clang 2.8 or earlier. Support for this version will be removed soon."
+#       warning "Using Clang 2.8 or earlier. Support for this version has been removed."
 #   endif
 #elif defined(__GNUC__)
-#   if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
-#       warning "Using GCC 4.3 or earlier. Support for this version will be removed soon."
+#   if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
+#       warning "Using GCC 4.5 or earlier. Support for this version has been removed."
 #   endif
 #elif defined(_MSC_VER)
-#   if (_MSC_VER < 1600)
-#       pragma message("WARNING: Using Visual Studio 2008 or earlier. Support for this version will be removed soon.")
+#   if (_MSC_VER < 1800)
+#       pragma message("WARNING: Using Visual Studio 2012 or earlier. Support for this version has been removed.")
 #   endif
 #endif