diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71bfcb805..9b7920340 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,14 +110,14 @@ find_package(Threads)
 include_directories(${include_directories}
     "${PROJECT_BINARY_DIR}"
     "${CCOMMON_SOURCE_DIR}/include"
-    "${PROJECT_SOURCE_DIR}/src"
-    "${CHECK_INCLUDES}")
+    "${PROJECT_SOURCE_DIR}/src")
 
 # server
 add_subdirectory(src)
 
 # tests: always build last
 if(CHECK_WORKING)
+    include_directories(${include_directories} "${CHECK_INCLUDES}")
     add_subdirectory(test)
 endif(CHECK_WORKING)
 
diff --git a/deps/ccommon/CMakeLists.txt b/deps/ccommon/CMakeLists.txt
index 3dc14017c..93067d859 100644
--- a/deps/ccommon/CMakeLists.txt
+++ b/deps/ccommon/CMakeLists.txt
@@ -122,8 +122,7 @@ find_package(Threads)
 # where to find include files
 include_directories(${include_directories}
     "${PROJECT_BINARY_DIR}"
-    "include"
-    "${CHECK_INCLUDES}")
+    "include")
 
 ###################
 # things to build #
@@ -131,6 +130,7 @@ include_directories(${include_directories}
 
 add_subdirectory(src)
 if(CHECK_WORKING)
+    include_directories(${include_directories} "${CHECK_INCLUDES}")
     add_subdirectory(test)
 endif(CHECK_WORKING)