diff --git a/.appveyor.yml b/.appveyor.yml
index 90c14dfd..5277c594 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,6 +25,9 @@ image:
 
 build: off
 
+# 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: >-
@@ -39,6 +42,10 @@ test_script:
 
     cryptest.exe tv all
 
+# Right now, we have a few failures that we don't know how to workaround.
+#  - https://stackoverflow.com/questions/43441273/how-to-run-vcupgrade-before-appveyor-build
+#  - https://stackoverflow.com/questions/43423761/cant-perform-64-bit-testing-under-appveyor
+
 notifications:
   - provider: Email
     to:
diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 66c29151..73d775bc 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -12,10 +12,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -24,10 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
   <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
@@ -131,15 +123,6 @@
       <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
-  <!-- ARM Configurations -->
-  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
-    <ClCompile>
-      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineARM</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
   <!-- X64 Configurations -->
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'" Label="X64 Configuration">
     <Link>
diff --git a/cryptest.vcxproj b/cryptest.vcxproj
index c738b877..15ab2a5a 100644
--- a/cryptest.vcxproj
+++ b/cryptest.vcxproj
@@ -12,10 +12,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -24,10 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="DLL-Import Debug|Win32">
       <Configuration>DLL-Import Debug</Configuration>
       <Platform>Win32</Platform>
@@ -185,15 +177,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <!-- ARM Configurations -->
-  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
-    <ClCompile>
-      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineARM</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
   <!-- FIPS Validated Warning -->
   <ItemDefinitionGroup Label="FIPS Warning">
     <PreBuildEvent Condition="'$(Configuration)'=='DLL-Import Debug' Or '$(Configuration)'=='DLL-Import Release'">
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index 14ccf291..7c04159e 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -12,10 +12,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -24,11 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
     <ProjectConfiguration Include="DLL-Import Debug|Win32">
       <Configuration>DLL-Import Debug</Configuration>
       <Platform>Win32</Platform>
@@ -168,15 +159,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
-  <!-- ARM Configurations -->
-  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
-    <ClCompile>
-      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineARM</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
   <!-- Original File with special treatment -->
   <!-- Source Files -->
   <!-- The order of the first three matters -->
diff --git a/dlltest.vcxproj b/dlltest.vcxproj
index c6624cae..7ad5d0a6 100644
--- a/dlltest.vcxproj
+++ b/dlltest.vcxproj
@@ -12,10 +12,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -24,10 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
   <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
@@ -131,15 +123,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <!-- ARM Configurations -->
-  <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'" Label="ARM Configuration">
-    <ClCompile>
-      <PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineARM</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
   <!-- Source Files -->
   <ItemGroup>
     <ClCompile Include="dlltest.cpp" />