diff --git a/.appveyor.yml b/.appveyor.yml
index 588bd0de..68e09c54 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -24,14 +24,17 @@ image:
 
 build: off
 
-#  project: cryptest.sln
-#  verbosity: minimal
-#  parallel: true
+# Extra copy gyrations due to broken MSbuild. Run 'make appveyor' to update the vcxproj files. Also see
+# https://stackoverflow.com/questions/45474857/why-does-appveyor-use-vs2010-tools-for-vs2015-image
 
 test_script:
 
 - cmd: >-
 
+    copy /y TestScripts\cryptlib.vcxproj .
+
+    copy /y TestScripts\cryptest.vcxproj .
+
     msbuild /t:Build /p:platform=%platform%;configuration=%configuration% cryptlib.vcxproj
 
     msbuild /t:Build /p:platform=%platform%;configuration=%configuration% cryptest.vcxproj
@@ -47,8 +50,8 @@ test_script:
 #  - https://stackoverflow.com/questions/43423761/cant-perform-64-bit-testing-under-appveyor
 
 notifications:
-    - provider: Email
-      to:
-        - cryptopp-build@googlegroups.com
-      on_build_success: true
-      on_build_failure: true
+  - provider: Email
+    to:
+      - cryptopp-build@googlegroups.com
+    on_build_success: true
+    on_build_failure: true
diff --git a/GNUmakefile b/GNUmakefile
index f74e64ae..a27e5477 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -652,6 +652,13 @@ ifeq ($(strip $(DOXYGEN_DIRECTORY)),)
 DOXYGEN_DIRECTORY := html-docs
 endif
 
+# Extra copy gyrations due to broken MSbuild. Run 'make appveyor' to update the vcxproj files. Also see
+# https://stackoverflow.com/questions/45474857/why-does-appveyor-use-vs2010-tools-for-vs2015-image
+.PHONY: appveyor
+appveyor:
+	sed 's|Toolset>v100|Toolset>v140|g;s|ToolsVersion="4.0"|ToolsVersion="14.0"|g' cryptlib.vcxproj > TestScripts/cryptlib.vcxproj
+	sed 's|Toolset>v100|Toolset>v140|g;ToolsVersion="4.0"|ToolsVersion="14.0"|g' cryptest.vcxproj > TestScripts/cryptest.vcxproj
+
 # Builds the documentation. Directory name is ref563, ref570, etc.
 .PHONY: docs html
 docs html: