diff --git a/CMakeLists.txt b/CMakeLists.txt
index e61682673..68bba9cf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ endif()
 ## INCLUDE
 ##
 ##
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 include(ExternalProject)
 
 ##
@@ -45,7 +46,7 @@ option(JSON_MultipleHeaders     "Use non-amalgamated version of the library." OF
 option(JSON_SystemInclude       "Include as system headers (skip for clang-tidy)." OFF)
 
 if (JSON_CI)
-    include(cmake/ci.cmake)
+    include(ci)
 endif ()
 
 ##
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
index 1243f54ea..325904d12 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -23,7 +23,7 @@ if(NOT benchmark_POPULATED)
 endif()
 
 # download test data
-include(${CMAKE_SOURCE_DIR}/../cmake/download_test_data.cmake)
+include(download_test_data)
 
 # benchmark binary
 add_executable(json_benchmarks src/benchmarks.cpp)
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 73a0df0ee..1d146646b 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -4,7 +4,7 @@ set(_json_test_cmake_list_file ${CMAKE_CURRENT_LIST_FILE})
 # download test data
 #############################################################################
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/download_test_data.cmake)
+include(download_test_data)
 
 # test fixture to download test data
 add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7786043f0..918416bb7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ option(JSON_FastTests   "Skip expensive/slow tests." OFF)
 
 set(JSON_TestStandards "" CACHE STRING "The list of standards to test explicitly.")
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/test.cmake)
+include(test)
 
 #############################################################################
 # override standard support