diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a3cf2a8bb72a6ca8a07cd7e5d6e9dd174c8013..0d542114d7c1ea7ec469261bb7a8ee55b5d40699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,7 @@ IF(OGS_USE_EIGEN)
 	IF (EIGEN_NO_DEBUG)
 		ADD_DEFINITIONS(-DEIGEN_NO_DEBUG)
 	ENDIF()
+	INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
 ENDIF()
 
 ADD_SUBDIRECTORY( Applications )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7c15e9837b31e5bbca90465f4ace8af5b5fa594f..923113e5441aff96047bcfb18eee2a02e707029f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -32,10 +32,6 @@ IF (LIS_FOUND)
 	INCLUDE_DIRECTORIES(${LIS_INCLUDE_DIR})
 ENDIF()
 
-IF (OGS_USE_EIGEN)
-	INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
-ENDIF()
-
 ADD_EXECUTABLE (testrunner testrunner.cpp ${TEST_SOURCES})
 SET_TARGET_PROPERTIES(testrunner PROPERTIES FOLDER Testing)
 IF(TARGET Eigen)