diff --git a/appveyor.yml b/appveyor.yml
index 4c94289873..0b0fa201dc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,13 +6,16 @@ version: 1.{build}-{branch}
 environment:
   matrix:
   - platform: Win32
-    target: ReleaseAll
+    target: AppVeyor
     visualstudio_string: vs2015
   - platform: Win32
     VisualStudioVersion: 12.0
-    target: ReleaseAll
+    target: AppVeyor
     visualstudio_string: vs2013
 
+matrix:
+  fast_finish: true
+
 init:
 # Use CRLF line endings on Windows so users can just use Notepad.
   - git config --global core.autocrlf true
diff --git a/buildbot.xml b/buildbot.xml
index 32a6807360..536ed21b12 100644
--- a/buildbot.xml
+++ b/buildbot.xml
@@ -40,7 +40,7 @@
     </ItemGroup>
     <Delete Files="@(CruftToDelete)" />
   </Target>
-  <Target Name="InternalBuild" AfterTargets="DebugAll;DevelAll;ReleaseAll">
+  <Target Name="InternalBuild" AfterTargets="DebugAll;DevelAll;ReleaseAll;AppVeyor">
     <MSBuild Projects="@(SolutionSet)" BuildInParallel="false" Properties="Configuration=$(BaseConfiguration)" Targets="Clean" />
     <MSBuild Projects="@(ProjectSetCPU)" BuildInParallel="false" Properties="Configuration=%(ConfigCPU.Identity)" Targets="Clean" />
     <CallTarget Targets="CleanCruft" />
@@ -73,4 +73,12 @@
       <ConfigCPU Include="Release AVX;Release AVX2;Release SSE4;Release SSSE3"/>
     </ItemGroup>
   </Target>
+  <Target Name="AppVeyor">
+    <PropertyGroup>
+      <BaseConfiguration>Release</BaseConfiguration>
+    </PropertyGroup>
+    <ItemGroup>
+      <ConfigCPU Include="Release AVX2"/>
+    </ItemGroup>
+  </Target>
 </Project>