diff --git a/CMakeLists.txt b/CMakeLists.txt
index e599f0426b7ada44d989f71a7538b555078ff399..2a110f6e2690ff86ad18cd2d4f2128081d229587 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,11 @@ if(OGS_USE_EIGEN)
 	endif()
 endif()
 
+if(OGS_BUILD_TESTS)
+	set(Data_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Data CACHE INTERNAL "")
+	set(Data_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
+endif()
+
 ######################
 ### Subdirectories ###
 ######################
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 51845c42955d596c3c52a84a68b1dc1bd319b9a5..5ffb0a1e0141ec722548b879c1ef02ca7e2c52af 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -14,8 +14,6 @@ set(REQUIRED_SUBMODULES
 )
 if(OGS_BUILD_TESTS)
 	list(APPEND REQUIRED_SUBMODULES Tests/Data)
-	set(Data_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Data CACHE INTERNAL "")
-	set(Data_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
 endif()
 
 foreach(SUBMODULE ${REQUIRED_SUBMODULES})