diff --git a/build.zig b/build.zig
index 57af7eaeca..19324968ef 100644
--- a/build.zig
+++ b/build.zig
@@ -85,7 +85,11 @@ pub fn build(b: &Builder) {
 
     b.default_step.dependOn(&exe.step);
     b.default_step.dependOn(docs_step);
-    test_step.dependOn(&exe.step);
+
+    const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") ?? false;
+    if (!skip_self_hosted) {
+        test_step.dependOn(&exe.step);
+    }
 
     b.installArtifact(exe);
     installStdLib(b, std_files);
diff --git a/ci/appveyor/appveyor.yml b/ci/appveyor/appveyor.yml
index de8b621bac..0cae78027b 100644
--- a/ci/appveyor/appveyor.yml
+++ b/ci/appveyor/appveyor.yml
@@ -6,5 +6,4 @@ build_script:
 after_build:
   - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat'
 cache:
-  - 'llvm+clang-5.0.0-win64-msvc-release.tar.xz'
   - 'llvm+clang-5.0.1-win64-msvc-release.tar.xz'
diff --git a/ci/appveyor/build_script.bat b/ci/appveyor/build_script.bat
index 356560d63a..63302d1c67 100644
--- a/ci/appveyor/build_script.bat
+++ b/ci/appveyor/build_script.bat
@@ -23,7 +23,7 @@ cd %ZIGBUILDDIR%
 cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release "-DZIG_LIBC_INCLUDE_DIR=C:\Program Files (x86)\Windows Kits\10\Include\10.0.26624.0\ucrt" "-DZIG_LIBC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\bin\x64\ucrt" "-DZIG_LIBC_STATIC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\Lib\10.0.26624.0\ucrt\x64" || exit /b
 msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b
 
-bin\zig.exe build --build-file ..\build.zig test || exit /b
+bin\zig.exe build --build-file ..\build.zig test -Dskip-self-hosted || exit /b
 
 @echo "MSVC build succeeded, proceeding with MinGW build"
 cd %APPVEYOR_BUILD_FOLDER%