diff --git a/Makefile b/Makefile
index 8f39a254a..ccda4e2c3 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,9 @@ mk_cmake:
 		-DKOMPUTE_OPT_BUILD_SHADERS=1 \
 		-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1 \
 		-DKOMPUTE_OPT_ENABLE_SPDLOG=1 \
+		-DSPDLOG_INSTALL=1 \
 		-DKOMPUTE_OPT_CODE_COVERAGE=1 \
+		-DSHADERC_SKIP_TESTS=1 \
 		-G "Unix Makefiles"
 
 mk_build_all:
@@ -121,6 +123,8 @@ vs_cmake:
 		-DKOMPUTE_OPT_BUILD_SHADERS=1 \
 		-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1 \
 		-DKOMPUTE_OPT_ENABLE_SPDLOG=1 \
+		-DSPDLOG_INSTALL=1 \
+		-DSHADERC_SKIP_TESTS=1 \
 		-G "Visual Studio 16 2019"
 
 vs_build_all:
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3ea9a7b22..4289dc7ef 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -55,7 +55,7 @@ if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
 
     target_include_directories(
         test_kompute PRIVATE
-        ${shaderc_SOURCE_DIR}/include)
+        ${PROJECT_SOURCE_DIR}/external/shaderc/libshaderc/include)
 
     target_link_libraries(test_kompute PRIVATE
         shaderc_combined)