diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1965fe3b..5a94274c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -417,10 +417,6 @@ endif()
 
 find_package(ZLIB REQUIRED)
 
-if(BUILD_CORE_TESTS)
-    include_directories(depends/googletest/googletest/include)
-endif()
-
 include_directories(depends/protobuf)
 include_directories(depends/lua/include)
 include_directories(depends/md5)
@@ -437,9 +433,10 @@ if(BUILD_TESTING OR BUILD_CORE_TESTS)
     macro(dfhack_test name files)
         message("dfhack_test(${name}, ${files})")
         add_executable(${name} ${files})
+        target_include_directories(${name} PUBLIC depends/googletest/googletest/include)
         target_link_libraries(${name} dfhack gtest)
-        add_test(NAME ${name} COMMAND ${name})
         set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
+        add_test(NAME ${name} COMMAND ${name})
     endmacro()
     include(CTest)
 endif()