diff --git a/CMakeLists.txt b/CMakeLists.txt
index c043adc581d892b249af2bce31ca57baf149130a..31767af1e6abb600fff1e615a83010cbba2a3f66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,8 @@ ENDIF() #OGS_PACKAGING
 # Add subdirectories with the projects
 ADD_SUBDIRECTORY( ThirdParty )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ThirdParty )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ThirdParty/quickcheck )
+
 ADD_SUBDIRECTORY( BaseLib )
 ADD_SUBDIRECTORY( FemLib )
 ADD_SUBDIRECTORY( FileIO )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index de21e00f2b144056e6486b4d20e6ef4c1a949769..69f73c75decf7cc4fc2b9fb63c03d77db50fdf67 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -10,7 +10,6 @@ APPEND_SOURCE_FILES(TEST_SOURCES GeoLib)
 
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/Tests/gtest
-	${CMAKE_SOURCE_DIR}/Tests/quickcheck
 	${CMAKE_SOURCE_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/GeoLib
 )
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index d12eec6d407f5ace9a8bb85a596db93d21603d12..25d27330e5168e06a17405e8b5e2b5f02f69ee37 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -8,4 +8,4 @@ SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog")
 
 ADD_SUBDIRECTORY(zlib)
 
-ADD_SUBDIRECTORY(gtest)
\ No newline at end of file
+ADD_SUBDIRECTORY(gtest)
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 9c99899b9514a77ce01169b2f06340342706ac1b..06d8946c0f0ad596cac8c3c2fdae48e1b6689652 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -1,7 +1,7 @@
 # This file initializes the required submodules
 
 SET(REQUIRED_SUBMODULES
-	Tests/quickcheck
+	ThirdParty/quickcheck
 )
 
 FOREACH(SUBMODULE ${REQUIRED_SUBMODULES})