diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7be1c057c..f13bbf4c7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,6 +6,8 @@ option(JSON_FastTests   "Skip expensive/slow tests." OFF)
 set(JSON_32bitTest     AUTO CACHE STRING "Enable the 32bit unit test (ON/OFF/AUTO/ONLY).")
 set(JSON_TestStandards "" CACHE STRING "The list of standards to test explicitly.")
 
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
 include(test)
 
 #############################################################################
diff --git a/cmake/download_test_data.cmake b/tests/cmake/download_test_data.cmake
similarity index 100%
rename from cmake/download_test_data.cmake
rename to tests/cmake/download_test_data.cmake
diff --git a/cmake/test.cmake b/tests/cmake/test.cmake
similarity index 100%
rename from cmake/test.cmake
rename to tests/cmake/test.cmake