diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5ce15b6d..3f66db2e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,12 +32,15 @@ if(BUILD_TESTS)
     enable_testing()
 endif()
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules/")
+
 if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_LESS 2.8.8)
     set(CMAKE_NO_OBJECT_TARGET 1)
     message(WARNING "CMake version < 2.8.8 is used, compilation with tests enabled will take a lot more time.")
-endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules/")
+    cmake_policy(SET CMP0017 NEW)
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules-compatibility/")
+endif()
 
 # Check dependencies
 find_package(Corrade REQUIRED)
diff --git a/modules/CMakeParseArguments.cmake b/modules-compatibility/CMakeParseArguments.cmake
similarity index 100%
rename from modules/CMakeParseArguments.cmake
rename to modules-compatibility/CMakeParseArguments.cmake
diff --git a/modules/FindPackageHandleStandardArgs.cmake b/modules-compatibility/FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from modules/FindPackageHandleStandardArgs.cmake
rename to modules-compatibility/FindPackageHandleStandardArgs.cmake
diff --git a/modules/FindPackageMessage.cmake b/modules-compatibility/FindPackageMessage.cmake
similarity index 100%
rename from modules/FindPackageMessage.cmake
rename to modules-compatibility/FindPackageMessage.cmake