diff --git a/CMakeLists.txt b/CMakeLists.txt
index d16e648..6f21a1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,184 +1,184 @@
 #=============================================================================
 # Copyright 2006-2013 Alex Neundorf <neundorf@kde.org>
 # Copyright 2014-2015 Alex Merry <alex.merry@kde.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #=============================================================================
 
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 #
 # Preliminary setup
 #
 
 set(VERSION "5.64.0") # handled by release scripts
 
 if (POLICY CMP0048)
     cmake_policy(SET CMP0048 NEW)
     project(ECM
         VERSION "${VERSION}"
         LANGUAGES NONE
     )
 else()
     project(ECM NONE)
     include("${CMAKE_SOURCE_DIR}/modules/ECMSetupVersion.cmake")
     ecm_setup_version(
         "${VERSION}"
         VARIABLE_PREFIX ECM
     )
 endif()
 
 
 #
 # Includes
 #
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 include(FeatureSummary)
 
 
 #
 # Installation paths
 #
 
 set(SHARE_INSTALL_DIR share
     CACHE
     PATH
     "read-only architecture-independent data"
 )
 
 set(CMAKECONFIG_INSTALL_DIR       ${SHARE_INSTALL_DIR}/ECM/cmake/)
 
 set(FIND_MODULES_INSTALL_DIR      ${SHARE_INSTALL_DIR}/ECM/find-modules/)
 set(KDE_MODULES_INSTALL_DIR       ${SHARE_INSTALL_DIR}/ECM/kde-modules/)
 set(MODULES_INSTALL_DIR           ${SHARE_INSTALL_DIR}/ECM/modules/)
 set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/)
 
 set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/ECM
     CACHE
     PATH
     "HTML and QtHelp documentation"
 )
 set(MAN_INSTALL_DIR ${SHARE_INSTALL_DIR}/man
     CACHE
     PATH
     "man pages"
 )
 
 
 #
 # Documentation
 #
 
 add_subdirectory(docs)
 
 
 #
 # Tests
 #
 
 option(BUILD_TESTING "Build automated tests." ON)
 add_feature_info(BUILD_TESTING BUILD_TESTING "Build automated tests.")
 if(BUILD_TESTING)
     enable_testing()
     add_subdirectory(tests)
 endif()
 
 
 #
 # Install modules
 #
 
 file(GLOB installModuleFiles ${CMAKE_SOURCE_DIR}/modules/*[^~])
 install(FILES ${installModuleFiles} DESTINATION ${MODULES_INSTALL_DIR})
 
 file(GLOB installTestModuleFiles ${CMAKE_SOURCE_DIR}/test-modules/*[^~])
 install(FILES ${installTestModuleFiles} DESTINATION ${SHARE_INSTALL_DIR}/ECM/test-modules)
 
 file(GLOB installKdeModuleFiles ${CMAKE_SOURCE_DIR}/kde-modules/*[^~])
 install(FILES ${installKdeModuleFiles} DESTINATION ${KDE_MODULES_INSTALL_DIR})
 
 file(GLOB installFindModuleFiles ${CMAKE_SOURCE_DIR}/find-modules/*.cmake ${CMAKE_SOURCE_DIR}/find-modules/*.py)
 install(FILES ${installFindModuleFiles} DESTINATION ${FIND_MODULES_INSTALL_DIR})
 
 file(GLOB installToolchainModuleFiles ${CMAKE_SOURCE_DIR}/toolchain/*[^~])
 install(FILES ${installToolchainModuleFiles} DESTINATION ${TOOLCHAIN_MODULES_INSTALL_DIR})
 
 
 #
 # Config.cmake file
 #
 
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(
     ECMConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ECMConfig.cmake
     INSTALL_DESTINATION
         ${CMAKECONFIG_INSTALL_DIR}
     PATH_VARS
         FIND_MODULES_INSTALL_DIR
         KDE_MODULES_INSTALL_DIR
         MODULES_INSTALL_DIR
 )
 
 write_basic_package_version_file(
     ${CMAKE_CURRENT_BINARY_DIR}/ECMConfigVersion.cmake
     VERSION
         "${PROJECT_VERSION}"
     COMPATIBILITY
         AnyNewerVersion
 )
 
 install(
     FILES
         ${CMAKE_CURRENT_BINARY_DIR}/ECMConfig.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/ECMConfigVersion.cmake
     DESTINATION
         ${CMAKECONFIG_INSTALL_DIR}
 )
 
 
 #
 # Packaging
 #
 
 set(CPACK_PACKAGE_NAME extra-cmake-modules)
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_SYSTEM_NAME "generic")
 set(CPACK_GENERATOR "TGZ")
 set(CPACK_SET_DESTDIR FALSE)
 
 include(CPack)
 
 
 #
 # Feature summary
 #
 
 feature_summary(
     FATAL_ON_MISSING_REQUIRED_PACKAGES
     WHAT ALL
 )
diff --git a/tests/ECMAddAppIconTest/CMakeLists.txt b/tests/ECMAddAppIconTest/CMakeLists.txt
index 93dfd56..6782c63 100644
--- a/tests/ECMAddAppIconTest/CMakeLists.txt
+++ b/tests/ECMAddAppIconTest/CMakeLists.txt
@@ -1,64 +1,64 @@
 project(ECMAddAppIconTest)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH
     ${CMAKE_CURRENT_SOURCE_DIR}/../../modules
     ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules
 )
 
 include(ECMAddAppIcon)
 
 if(WIN32)
     set(icon_extension_to_test "rc")
 elseif(APPLE)
     set(icon_extension_to_test "icns")
 endif()
 
 #### Test 1: ecm_add_app_icon with only regular icons and no OUTFILE_BASENAME ####
 set(ICONS_1 16-category-name.png 128-category-name.png)
 ecm_add_app_icon(OUT_1 ICONS ${ICONS_1})
 
 if(WIN32 OR APPLE)
     list(LENGTH OUT_1 out_count)
     if(out_count EQUAL 0)
         message(FATAL_ERROR "ecm_add_app_icon() hasn't produced anything")
     endif()
 
 
     if(NOT OUT_1 MATCHES "OUT_1.${icon_extension_to_test}")
         message(FATAL_ERROR "ecm_add_app_icon() did not fall back to target name for icon name: ${OUT_1}")
     endif()
 endif()
 
 add_custom_target(t_1 ALL DEPENDS ${OUT_1})
 list(APPEND OUT "${OUT_1}")
 
 #### Test 2: ecm_add_app_icon with regular and sidebar icons and OUTFILE_BASENAME set ####
 set(ICONS_2 16-category-name.png 128-category-name.png)
 set(SIDEBAR_ICONS_2 16-category-name-sidebar.png 128-category-name-sidebar.png)
 
 ecm_add_app_icon(OUT_2 ICONS ${ICONS_2} SIDEBAR_ICONS ${SIDEBAR_ICONS_2} OUTFILE_BASENAME "SuperBasename")
 
 if(WIN32 OR APPLE)
     list(LENGTH OUT_2 out_count)
     if(out_count EQUAL 0)
         message(FATAL_ERROR "ecm_add_app_icon() hasn't produced anything")
     endif()
 
     if(NOT OUT_2 MATCHES "SuperBasename.${icon_extension_to_test}")
         message(FATAL_ERROR "ecm_add_app_icon() did not respect OUTFILE_BASENAME: ${OUT_2}")
     endif()
 endif()
 
 if(APPLE)
     list(APPEND expected_icons "icon_16x16.png" "icon_128x128.png" "sidebar_16x16.png" "sidebar_32x32.png")
     foreach(expected_icon ${expected_icons})
         list(APPEND OUT_2 "${CMAKE_CURRENT_BINARY_DIR}/SuperBasename.iconset/${expected_icon}")
     endforeach()
 endif()
 
 add_custom_target(t_2 ALL DEPENDS ${OUT_2})
 list(APPEND OUT "${OUT_2}")
 
 #### this will be run by CTest ####
 configure_file(check_files.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/check_files.cmake" @ONLY)
diff --git a/tests/ECMAddTests/multi_tests/CMakeLists.txt b/tests/ECMAddTests/multi_tests/CMakeLists.txt
index 0133c7d..1e3f789 100644
--- a/tests/ECMAddTests/multi_tests/CMakeLists.txt
+++ b/tests/ECMAddTests/multi_tests/CMakeLists.txt
@@ -1,155 +1,155 @@
 project(ECMAddTests)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 set(CMAKE_MODULE_PATH "${ECM_MODULE_DIR}")
 
 add_library(testhelper STATIC ../testhelper.cpp)
 target_include_directories(testhelper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
 enable_testing()
 
 include(ECMAddTests)
 include(../../test_helpers.cmake)
 
 # clean up to avoid false-positives from check_files.cmake
 file(REMOVE
     "${CMAKE_CURRENT_BINARY_DIR}/test1.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test2.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test3.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test4.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test5.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test6.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test7.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test8.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test9.txt"
     )
 
 set(exp_target_names "test1;test2;test3")
 set(exp_test_names "test1;test2;test3")
 ecm_add_tests(
     test1.cpp
     test2.cpp
     test3.cpp
     LINK_LIBRARIES testhelper
     TARGET_NAMES_VAR target_names
     TEST_NAMES_VAR test_names
     )
 assert_vars_setequal(target_names exp_target_names)
 assert_vars_setequal(test_names exp_test_names)
 # check targets exist
 get_property(_dummy TARGET test1 PROPERTY TYPE)
 get_property(_dummy TARGET test2 PROPERTY TYPE)
 get_property(_dummy TARGET test3 PROPERTY TYPE)
 # check tests exists
 get_property(_dummy TEST test1 PROPERTY TIMEOUT)
 get_property(_dummy TEST test2 PROPERTY TIMEOUT)
 get_property(_dummy TEST test3 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test1 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "test1 is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET test1 PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "test1 is an OS/X bundle when it should not be")
 endif()
 get_property(_is_win32 TARGET test2 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "test2 is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET test2 PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "test2 is an OS/X bundle when it should not be")
 endif()
 
 
 ecm_add_tests(
     test4.cpp
     test5.cpp
     LINK_LIBRARIES testhelper
     NAME_PREFIX pref_
     )
 get_property(_dummy TARGET test4 PROPERTY TYPE)
 get_property(_dummy TARGET test5 PROPERTY TYPE)
 get_property(_dummy TEST pref_test4 PROPERTY TIMEOUT)
 get_property(_dummy TEST pref_test5 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test4 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "test4 is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET test4 PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "test4 is an OS/X bundle when it should not be")
 endif()
 get_property(_is_win32 TARGET test5 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "test5 is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET test5 PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "test5 is an OS/X bundle when it should not be")
 endif()
 
 
 ecm_add_tests(
     test6.cpp
     test7.cpp
     LINK_LIBRARIES testhelper
     GUI
     )
 get_property(_dummy TARGET test6 PROPERTY TYPE)
 get_property(_dummy TARGET test7 PROPERTY TYPE)
 get_property(_dummy TEST test6 PROPERTY TIMEOUT)
 get_property(_dummy TEST test7 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test6 PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "test6 is not a WIN32 executable when it should be")
 endif()
 get_property(_is_bundle TARGET test6 PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "test6 is not an OS/X bundle when it should be")
 endif()
 get_property(_is_win32 TARGET test7 PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "test7 is not a WIN32 executable when it should be")
 endif()
 get_property(_is_bundle TARGET test7 PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "test7 is not an OS/X bundle when it should be")
 endif()
 
 
 set(exp_target_names "test8;test9")
 set(exp_test_names "p_test8;p_test9")
 ecm_add_tests(
     test8.cpp
     test9.cpp
     LINK_LIBRARIES testhelper
     NAME_PREFIX p_
     GUI
     TARGET_NAMES_VAR target_names
     TEST_NAMES_VAR test_names
     )
 assert_vars_setequal(target_names exp_target_names)
 assert_vars_setequal(test_names exp_test_names)
 get_property(_dummy TARGET test8 PROPERTY TYPE)
 get_property(_dummy TARGET test9 PROPERTY TYPE)
 get_property(_dummy TEST p_test8 PROPERTY TIMEOUT)
 get_property(_dummy TEST p_test9 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test8 PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "test8 is not a WIN32 executable when it should be")
 endif()
 get_property(_is_bundle TARGET test8 PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "test8 is not an OS/X bundle when it should be")
 endif()
 get_property(_is_win32 TARGET test9 PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "test9 is not a WIN32 executable when it should be")
 endif()
 get_property(_is_bundle TARGET test9 PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "test9 is not an OS/X bundle when it should be")
 endif()
 
diff --git a/tests/ECMAddTests/single_tests/CMakeLists.txt b/tests/ECMAddTests/single_tests/CMakeLists.txt
index 6af3857..3f599c0 100644
--- a/tests/ECMAddTests/single_tests/CMakeLists.txt
+++ b/tests/ECMAddTests/single_tests/CMakeLists.txt
@@ -1,122 +1,122 @@
 project(ECMAddTests)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 set(CMAKE_MODULE_PATH "${ECM_MODULE_DIR}")
 
 add_library(testhelper STATIC ../testhelper.cpp)
 target_include_directories(testhelper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
 enable_testing()
 
 include(ECMAddTests)
 
 # clean up to avoid false-positives from check_files.cmake
 file(REMOVE
     "${CMAKE_CURRENT_BINARY_DIR}/test1.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test2.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test3.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test4.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test5.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test6.txt"
     )
 
 ecm_add_test(test1.cpp
     LINK_LIBRARIES testhelper
     )
 # check target exists
 get_property(_dummy TARGET test1 PROPERTY TYPE)
 # check test exists
 get_property(_dummy TEST test1 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test1 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "test1 is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET test1 PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "test1 is an OS/X bundle when it should not be")
 endif()
 
 
 ecm_add_test(test2.cpp
     LINK_LIBRARIES testhelper
     TEST_NAME named_test
     )
 get_property(_dummy TARGET named_test PROPERTY TYPE)
 get_property(_dummy TEST named_test PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET named_test PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "named_test is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET named_test PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "named_test is an OS/X bundle when it should not be")
 endif()
 
 
 ecm_add_test(test3.cpp
     LINK_LIBRARIES testhelper
     NAME_PREFIX prefix_
     )
 get_property(_dummy TARGET test3 PROPERTY TYPE)
 get_property(_dummy TEST prefix_test3 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test3 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "test3 is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET test3 PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "test3 is an OS/X bundle when it should not be")
 endif()
 
 
 ecm_add_test(test4.cpp
     LINK_LIBRARIES testhelper
     GUI
     )
 get_property(_dummy TARGET test4 PROPERTY TYPE)
 get_property(_dummy TEST test4 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test4 PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "test4 is not a WIN32 executable when it should be")
 endif()
 get_property(_is_bundle TARGET test4 PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "test4 is not an OS/X bundle when it should be")
 endif()
 
 
 ecm_add_test(test5.cpp
     LINK_LIBRARIES testhelper
     TEST_NAME combined_test
     NAME_PREFIX another_prefix_
     GUI
     )
 get_property(_dummy TARGET combined_test PROPERTY TYPE)
 get_property(_dummy TEST another_prefix_combined_test PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET combined_test PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "combined_test is not a WIN32 executable when it should be")
 endif()
 get_property(_is_bundle TARGET combined_test PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "combined_test is not an OS/X bundle when it should be")
 endif()
 
 
 ecm_add_test(test6.cpp test6body.cpp
     LINK_LIBRARIES testhelper
     TEST_NAME multifile_test
     )
 get_property(_dummy TARGET multifile_test PROPERTY TYPE)
 get_property(_dummy TEST multifile_test PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET multifile_test PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
     message(FATAL_ERROR "multifile_test is a WIN32 executable when it should not be")
 endif()
 get_property(_is_bundle TARGET multifile_test PROPERTY MACOSX_BUNDLE)
 if (_is_bundle)
     message(FATAL_ERROR "multifile_test is an OS/X bundle when it should not be")
 endif()
 
 
diff --git a/tests/ECMInstallIconsTest/CMakeLists.txt b/tests/ECMInstallIconsTest/CMakeLists.txt
index f048889..fed41b2 100644
--- a/tests/ECMInstallIconsTest/CMakeLists.txt
+++ b/tests/ECMInstallIconsTest/CMakeLists.txt
@@ -1,106 +1,106 @@
 project(ECMInstallIconsTest)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
 
 # make sure the test install dir is clean
 file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}")
 
 include(ECMInstallIcons)
 
 add_subdirectory(v1-syntax)
 add_subdirectory(v1-syntax-l10n)
 add_subdirectory(v1-syntax-no-icons)
 
 ecm_install_icons(
     ICONS 16-actions-computer.png
     DESTINATION single-file-test
 )
 
 ecm_install_icons(
     ICONS
         16-actions-computer.png
         16-animations-loading.mng
         subdir/16-apps-cmake.png
         16-categories-system-help.mng
         16-emotes-face-smile.png
         16-intl-something.png
         16-status-user-online.png
         128-devices-drive-removable-media-usb-pendrive.png
         128-emblems-emblem-mounted.png
         128-places-home.mng
         sc-mimetypes-fonts-package.svgz
     DESTINATION multi-file-test
 )
 
 ecm_install_icons(
     ICONS
         16-actions-computer.png
         16-animations-loading.mng
         subdir/16-apps-cmake.png
         16-categories-system-help.mng
         16-emotes-face-smile.png
         16-intl-something.png
         16-status-user-online.png
         128-devices-drive-removable-media-usb-pendrive.png
         128-emblems-emblem-mounted.png
         128-places-home.mng
         sc-mimetypes-fonts-package.svgz
     DESTINATION themed-test
     THEME theme-name-2
 )
 
 ecm_install_icons(
     ICONS
         16-actions-computer.png
         16-animations-loading.mng
         subdir/16-apps-cmake.png
         16-categories-system-help.mng
         16-emotes-face-smile.png
         16-intl-something.png
         16-status-user-online.png
         128-devices-drive-removable-media-usb-pendrive.png
         128-emblems-emblem-mounted.png
         128-places-home.mng
         sc-mimetypes-fonts-package.svgz
     DESTINATION lang-test
     LANG en_US
 )
 
 ecm_install_icons(
     ICONS
         16-actions-computer.png
         16-animations-loading.mng
         subdir/16-apps-cmake.png
         16-categories-system-help.mng
         16-emotes-face-smile.png
         16-intl-something.png
         16-status-user-online.png
         128-devices-drive-removable-media-usb-pendrive.png
         128-emblems-emblem-mounted.png
         128-places-home.mng
         sc-mimetypes-fonts-package.svgz
     DESTINATION themed-lang-test
     THEME oxygen
     LANG en_US
 )
 
 # all these should be warned about
 ecm_install_icons(
     ICONS
         aa-actions-badsize.png          # ignored
         badlynamedfile.png              # ignored
         16-actions-badext.txt           # copied
         hi16-actions-old-style-name.png # copied
     DESTINATION badly-named-files-test
 )
 
 find_program(icon_cache_generator NAMES gtk-update-icon-cache)
 if (icon_cache_generator)
     set(GENERATE_ICON_CACHE TRUE)
 else()
     set(GENERATE_ICON_CACHE FALSE)
 endif()
 
 # this will be run by CTest
 configure_file(check_tree.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/check_tree.cmake" @ONLY)
diff --git a/tests/ECMPoQmToolsTest/CMakeLists.txt b/tests/ECMPoQmToolsTest/CMakeLists.txt
index 2cd76f8..8695454 100644
--- a/tests/ECMPoQmToolsTest/CMakeLists.txt
+++ b/tests/ECMPoQmToolsTest/CMakeLists.txt
@@ -1,153 +1,153 @@
 project(ECMPoQmToolsTest)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../modules")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
 
 # make sure the test install dir is clean
 file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}")
 
 include(ECMPoQmTools)
 
 include(../test_helpers.cmake)
 
 
 ##############################
 #                            #
 # ecm_process_po_files_as_qm #
 #                            #
 ##############################
 
 
 # Should create a process-and-install.qm file and install it
 ecm_process_po_files_as_qm(fr ALL
     INSTALL_DESTINATION share/locale
     PO_FILES process-and-install.po
 )
 
 # Should create a only-process.qm file, without installing it
 ecm_process_po_files_as_qm(fr ALL
     PO_FILES only-process.po
 )
 
 
 
 ##############################
 #                            #
 # ecm_install_po_files_as_qm #
 #                            #
 ##############################
 
 # Should create a bunch of .qm files and install them in share/locale.
 # Should ignore files directly under po/ as well as directories under po/ which
 # do not contain any .po files.
 ecm_install_po_files_as_qm(po)
 
 
 # Should create a bunch of .qm files and install them in
 # ${CMAKE_INSTALL_LOCALEDIR}
 set(CMAKE_INSTALL_LOCALEDIR custom-dir1)
 ecm_install_po_files_as_qm(po-custom-dir1)
 
 
 # Should create a bunch of .qm files and install them in
 # ${LOCALE_INSTALL_DIR}
 set(LOCALE_INSTALL_DIR custom-dir2)
 ecm_install_po_files_as_qm(po-custom-dir2)
 
 unset(CMAKE_INSTALL_LOCALEDIR)
 unset(LOCALE_INSTALL_DIR)
 
 
 
 ########################
 #                      #
 # ecm_create_qm_loader #
 #                      #
 ########################
 
 find_package(Qt5Core CONFIG REQUIRED)
 ecm_install_po_files_as_qm(tr_test-po)
 
 
 #
 # single-threaded test
 #
 set(tr_test_SRCS
     tr_test.cpp
 )
 ecm_create_qm_loader(tr_test_SRCS catalog)
 add_executable(tr_test ${tr_test_SRCS})
 target_link_libraries(tr_test PRIVATE Qt5::Core)
 
 
 #
 # single-threaded test (different catalog name, automoc)
 #
 # This is to check we don't overwrite previously-generated files.
 set(tr_test_2_SRCS
     tr_test.cpp
 )
 ecm_create_qm_loader(tr_test_2_SRCS catalog2)
 add_executable(tr_test_2 ${tr_test_2_SRCS})
 set_target_properties(tr_test_2 PROPERTIES AUTOMOC ON)
 target_include_directories(tr_test_2 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(tr_test_2 PRIVATE Qt5::Core)
 
 
 #
 # module for tr_thread_test
 #
 add_library(tr_thread_module MODULE tr_thread_test_module.cpp ${QMLOADER_FILES})
 target_link_libraries(tr_thread_module PRIVATE Qt5::Core)
 
 
 #
 # loading a module on a thread other than the main thread
 # (automoc)
 #
 set(tr_thread_test_SRCS
     tr_thread_test.cpp
 )
 ecm_create_qm_loader(tr_thread_test_SRCS catalog)
 add_executable(tr_thread_test ${tr_thread_test_SRCS})
 set_target_properties(tr_thread_test PROPERTIES AUTOMOC ON)
 target_include_directories(tr_thread_test PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 target_compile_definitions(tr_thread_test PRIVATE "MODULE_PATH=\"$<TARGET_FILE:tr_thread_module>\"")
 target_link_libraries(tr_thread_test PRIVATE Qt5::Core)
 
 
 #
 # loading a module on a thread other than the main thread
 # (different catalog, no AUTOMOC)
 #
 qt5_generate_moc(tr_thread_test.cpp "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test.moc")
 set(tr_thread_test_2_SRCS
     tr_thread_test.cpp
     "${CMAKE_CURRENT_BINARY_DIR}/tr_thread_test.moc"
 )
 ecm_create_qm_loader(tr_thread_test_2_SRCS catalog2)
 add_executable(tr_thread_test_2 ${tr_thread_test_2_SRCS})
 target_include_directories(tr_thread_test_2 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 target_compile_definitions(tr_thread_test_2 PRIVATE "MODULE_PATH=\"$<TARGET_FILE:tr_thread_module>\"")
 target_link_libraries(tr_thread_test_2 PRIVATE Qt5::Core)
 
 
 #
 # call to ecm_create_qm_loader is in a different CMakeLists.txt to where
 # the target it is added to is defined
 #
 # This is not something we want people to do, but it's unfortunately something
 # projects have done and we need to keep them building.
 unset(QMLOADER_FILES)
 ecm_create_qm_loader(QMLOADER_FILES catalog)
 assert_var_defined(QMLOADER_FILES)
 add_subdirectory(subdir)
 
 
 
 file(GENERATE
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/check_conf.cmake"
     INPUT "${CMAKE_CURRENT_SOURCE_DIR}/check_conf.cmake.in"
 )
 configure_file(check.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/check.cmake" @ONLY)
diff --git a/tests/ECMQMLModules/CMakeLists.txt b/tests/ECMQMLModules/CMakeLists.txt
index b908bd5..240352e 100644
--- a/tests/ECMQMLModules/CMakeLists.txt
+++ b/tests/ECMQMLModules/CMakeLists.txt
@@ -1,12 +1,12 @@
 project(extra-cmake-modules)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(ECM_FIND_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules)
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
 set(CMAKE_MODULE_PATH "${ECM_FIND_MODULE_DIR}" "${ECM_MODULE_DIR}")
 
 include(ECMQMLModules)
 
 ecm_find_qmlmodule(QtQuick 2.1)
 
 add_executable(dummy main.c)
diff --git a/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt b/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
index 15ece18..74f2431 100644
--- a/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
+++ b/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
@@ -1,42 +1,42 @@
 project(ECMQtDeclareLoggingCategoryTest)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../modules")
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_DIR})
 
 include(ECMQtDeclareLoggingCategory)
 
 ecm_qt_declare_logging_category(
     sources
     HEADER "log1.h"
     IDENTIFIER "log1"
     CATEGORY_NAME "log.one"
 )
 
 ecm_qt_declare_logging_category(
     sources
     HEADER "log2.h"
     IDENTIFIER "foo::bar::log2"
     CATEGORY_NAME "log.two"
 )
 
 ecm_qt_declare_logging_category(
     sources
     HEADER "${CMAKE_CURRENT_BINARY_DIR}/log3.h"
     IDENTIFIER "log3"
     CATEGORY_NAME "three"
     DEFAULT_SEVERITY Critical
 )
 
 find_package(Qt5Core REQUIRED)
 
 add_executable(testmain testmain.cpp ${sources})
 target_include_directories(testmain
     PRIVATE
         "${CMAKE_CURRENT_BINARY_DIR}"
 )
 target_link_libraries(testmain
     PRIVATE
         Qt5::Core
 )
 
diff --git a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt
index d8934c9..ea5ef2b 100644
--- a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt
@@ -1,17 +1,17 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_header)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     VERSION_HEADER "ecm_old_header_version.h"
 )
 
 include(../version_helpers.cmake)
 standard_version_var_checks(Foo 2.3.4)
 
 add_executable(check_header main.c)
 target_include_directories(check_header PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt
index cf58887..8fbc211 100644
--- a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt
@@ -1,18 +1,18 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_header_abspath)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/../ecm_old_header_abspath_version.h"
 )
 
 include(../version_helpers.cmake)
 
 standard_version_var_checks(Foo 2.3.4)
 
 add_executable(check_header main.c)
 target_include_directories(check_header PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/..")
diff --git a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt
index 28ca43c..80e670e 100644
--- a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt
@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_simple)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4 VARIABLE_PREFIX Foo)
 
 include(../version_helpers.cmake)
 standard_version_var_checks(Foo 2.3.4)
 
 add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt
index 630872a..9d87e14 100644
--- a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt
@@ -1,16 +1,16 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_soversion)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     SOVERSION 1
 )
 
 include(../version_helpers.cmake)
 standard_version_var_checks(Foo 2.3.4 1)
 
 add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt
index 5ab8f7b..8544e37 100644
--- a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt
@@ -1,18 +1,18 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_version_file)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     PACKAGE_VERSION_FILE FooVersion.cmake
 )
 
 include(../version_helpers.cmake)
 
 standard_version_var_checks(Foo 2.3.4)
 AnyNewer_2_3_4_checks("${CMAKE_CURRENT_BINARY_DIR}/FooVersion.cmake")
 
 add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt
index c8c4b3c..ee4a5ee 100644
--- a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt
@@ -1,18 +1,18 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_version_file_abspath)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/../OldVersionAbsPath.cmake"
 )
 
 include(../version_helpers.cmake)
 
 standard_version_var_checks(Foo 2.3.4)
 AnyNewer_2_3_4_checks("${CMAKE_CURRENT_BINARY_DIR}/../OldVersionAbsPath.cmake")
 
 add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt
index 562e9d7..445fd24 100644
--- a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt
@@ -1,18 +1,18 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_version_file_anynewer)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     PACKAGE_VERSION_FILE FooVersion.cmake COMPATIBILITY AnyNewerVersion
 )
 
 include(../version_helpers.cmake)
 
 standard_version_var_checks(Foo 2.3.4)
 AnyNewer_2_3_4_checks("${CMAKE_CURRENT_BINARY_DIR}/FooVersion.cmake")
 
 add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt
index 3a212fe..fbf8e9a 100644
--- a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt
@@ -1,53 +1,53 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_version_file_exact)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     PACKAGE_VERSION_FILE FooVersion.cmake COMPATIBILITY ExactVersion
 )
 
 include(../../test_helpers.cmake)
 include(../version_helpers.cmake)
 
 macro(find_foo version)
     test_version_file("${CMAKE_CURRENT_BINARY_DIR}/FooVersion.cmake" "${version}")
     assert_var_str_value(PACKAGE_VERSION "2.3.4")
 endmacro()
 
 standard_version_var_checks(Foo 2.3.4)
 
 # too old - fails
 find_foo("3.1.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # wrong major version - fails
 find_foo("1.1.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # wrong minor - fails
 find_foo("2.1.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # wrong patch - fails
 find_foo("2.3.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # tweak doesn't matter (but prevents P_V_EXACT being set) - succeeds
 find_foo("2.3.4.3")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # exact - succeeds
 find_foo("2.3.4")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
 assert_var_bool_value(PACKAGE_VERSION_EXACT TRUE)
 
 add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt
index 1e14a4c..8ac01d1 100644
--- a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt
@@ -1,53 +1,53 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(old_version_file_samemajor)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 include(ECMSetupVersion)
 
 ecm_setup_version(2.3.4
     VARIABLE_PREFIX Foo
     PACKAGE_VERSION_FILE FooVersion.cmake COMPATIBILITY SameMajorVersion
 )
 
 include(../../test_helpers.cmake)
 include(../version_helpers.cmake)
 
 macro(find_foo version)
     test_version_file("${CMAKE_CURRENT_BINARY_DIR}/FooVersion.cmake" "${version}")
     assert_var_str_value(PACKAGE_VERSION "2.3.4")
 endmacro()
 
 standard_version_var_checks(Foo 2.3.4)
 
 # too old - fails
 find_foo("3.1.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # wrong major version - fails
 find_foo("1.1.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # correct major version, more recent - succeeds
 find_foo("2.1.1")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # correct major version - succeeds
 find_foo("2")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # correct major version, but too old - fails
 find_foo("2.4.4")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
 assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
 
 # exact - succeeds
 find_foo("2.3.4")
 assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
 assert_var_bool_value(PACKAGE_VERSION_EXACT TRUE)
 
 add_executable(dummy main.c)
diff --git a/tests/ExecuteCoreModules/CMakeLists.txt b/tests/ExecuteCoreModules/CMakeLists.txt
index 2a224ca..d264fd7 100644
--- a/tests/ExecuteCoreModules/CMakeLists.txt
+++ b/tests/ExecuteCoreModules/CMakeLists.txt
@@ -1,13 +1,13 @@
 project(ExecuteCoreModules)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 file(GLOB all_core_modules "${CMAKE_CURRENT_SOURCE_DIR}/../../modules/*cmake")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
 
 foreach(module ${all_core_modules})
     message(STATUS "module: ${module}")
     include("${module}")
 endforeach()
 
 add_executable(dummy main.c)
diff --git a/tests/ExecuteKDEModules/CMakeLists.txt b/tests/ExecuteKDEModules/CMakeLists.txt
index 69a19a3..8653fe4 100644
--- a/tests/ExecuteKDEModules/CMakeLists.txt
+++ b/tests/ExecuteKDEModules/CMakeLists.txt
@@ -1,25 +1,25 @@
 project(ExecuteKDEModules)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 # order is important (install dirs before cmake settings)!
 set(all_kde_modules
     KDEInstallDirs
     KDECMakeSettings
     KDECompilerSettings
     KDEFrameworkCompilerSettings
     ECMMarkNonGuiExecutable
 )
 
 set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../kde-modules)
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
 set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}" "${ECM_MODULE_DIR}")
 
 foreach(module ${all_kde_modules})
     message(STATUS "module: ${module}")
     include("${module}")
 endforeach()
 
 add_executable(dummy main.c)
 ecm_mark_nongui_executable(dummy)
 
 set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/tests/FindModules/CMakeLists.txt b/tests/FindModules/CMakeLists.txt
index 0d2bbee..1e422b7 100644
--- a/tests/FindModules/CMakeLists.txt
+++ b/tests/FindModules/CMakeLists.txt
@@ -1,20 +1,20 @@
 project(FindModules)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 file(GLOB all_find_modules
      RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules"
      "${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules/Find*cmake")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules)
 
 foreach(module ${all_find_modules})
     string(REGEX REPLACE ".+Find([^\\.]+)\\.cmake" "\\1" packageName "${module}")
     message(STATUS "Finding package: ${packageName}")
     find_package(${packageName})
 
     if(NOT DEFINED ${packageName}_FOUND)
         message(SEND_ERROR "${packageName}_FOUND not defined!")
     endif()
 endforeach()
 
 add_executable(dummy main.c)
diff --git a/tests/KDEFetchTranslations/CMakeLists.txt b/tests/KDEFetchTranslations/CMakeLists.txt
index 6aca9b0..e68c796 100644
--- a/tests/KDEFetchTranslations/CMakeLists.txt
+++ b/tests/KDEFetchTranslations/CMakeLists.txt
@@ -1,31 +1,31 @@
 project(extra-cmake-modules)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 # order is important (install dirs before cmake settings)!
 set(all_kde_modules
     KDEInstallDirs
     KDECMakeSettings
     ECMMarkNonGuiExecutable
 )
 
 set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../kde-modules)
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
 set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}" "${ECM_MODULE_DIR}")
 
 foreach(module ${all_kde_modules})
     message(STATUS "module: ${module}")
     include("${module}")
 endforeach()
 
 _repository_name(name "${CMAKE_CURRENT_SOURCE_DIR}/../../")
 if (NOT ${name} STREQUAL "extra-cmake-modules")
     message(FATAL_ERROR "Wrong repository name: ${name}, should be 'extra-cmake-modules'")
 endif()
 add_executable(dummy ../ExecuteKDEModules/main.c)
 ecm_mark_nongui_executable(dummy)
 
 set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 if(NOT TARGET fetch-translations)
     message(FATAL_ERROR "should have a fetch-translations target")
 endif()
diff --git a/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt b/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt
index 1a7a7e7..1ac7d25 100644
--- a/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt
+++ b/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt
@@ -1,27 +1,27 @@
 project(KDEInstallDirs.relative_or_absolute)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules)
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}")
 include(KDEInstallDirs)
 
 include(../var_list.cmake)
 include(../../test_helpers.cmake)
 
 if(APPLE)
     # The default bundle directory is an absolute path
     set(BUNDLEDIR_should_be_absolute TRUE)
 endif()
 
 foreach(suffix ${var_suffixes})
     if(${suffix}_should_be_absolute)
         assert_var_absolute_path(KDE_INSTALL_${suffix})
     else()
         assert_var_relative_path(KDE_INSTALL_${suffix})
     endif()
     assert_var_absolute_path(KDE_INSTALL_FULL_${suffix})
 endforeach()
 
 add_executable(dummy main.c)
 set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt b/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt
index 73e6db5..4db7803 100644
--- a/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt
+++ b/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt
@@ -1,38 +1,38 @@
 project(KDEInstallDirs.vars_in_sync)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules)
 set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
 set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}")
 include(KDEInstallDirs)
 
 include(../var_list.cmake)
 include(../../test_helpers.cmake)
 
 foreach(suffix ${var_suffixes})
     assert_var_defined(KDE_INSTALL_${suffix})
     if(DEFINED ${suffix}_expected_value)
         assert_vars_strequal(KDE_INSTALL_${suffix} ${suffix}_expected_value)
     endif()
     assert_var_defined(KDE_INSTALL_FULL_${suffix})
 
     if(should_set_CMAKE_INSTALL_${suffix})
         assert_vars_strequal(CMAKE_INSTALL_${suffix} KDE_INSTALL_${suffix})
         assert_vars_strequal(CMAKE_INSTALL_FULL_${suffix} KDE_INSTALL_FULL_${suffix})
     endif()
 
     if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED AND DEFINED compat_${suffix})
         assert_vars_strequal(${compat_${suffix}} KDE_INSTALL_${suffix})
     endif()
 endforeach()
 
 assert_var_defined(KF5_INSTALL_TARGETS_DEFAULT_ARGS)
 assert_var_defined(KDE_INSTALL_TARGETS_DEFAULT_ARGS)
 if(NOT KDE_INSTALL_DIRS_NO_CMAKE_VARIABLES AND
    NOT KDE_INSTALL_DIRS_NO_DEPRECATED)
     assert_vars_strequal(INSTALL_TARGETS_DEFAULT_ARGS
                          KDE_INSTALL_TARGETS_DEFAULT_ARGS)
 endif()
 
 add_executable(dummy main.c)
 set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt b/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt
index d9cbb7f..cc27ab8 100644
--- a/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt
+++ b/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(plasma-%{APPNAMELC})
  
 find_package(ECM 1.4.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(KF5Plasma REQUIRED)
 
 plasma_install_package(package org.kde.%{APPNAMELC})
diff --git a/tests/UseFindModules/CMakeLists.txt b/tests/UseFindModules/CMakeLists.txt
index a6861ef..8fc6721 100644
--- a/tests/UseFindModules/CMakeLists.txt
+++ b/tests/UseFindModules/CMakeLists.txt
@@ -1,30 +1,30 @@
 project(UseFindModules)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(ECM_FIND_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules")
 set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../modules")
 
 file(GLOB all_find_modules
      RELATIVE "${ECM_FIND_MODULE_DIR}"
      "${ECM_FIND_MODULE_DIR}/Find*cmake")
 
 set(package_list)
 foreach(module ${all_find_modules})
     string(REGEX REPLACE ".+Find([^\\.]+)\\.cmake" "\\1" packageName "${module}")
     list(APPEND package_list "${packageName}")
 endforeach()
 
 include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake")
 ecm_use_find_modules(DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake"
                      MODULES ${package_list})
 
 foreach(packageName ${package_list})
     message(STATUS "Finding package: ${packageName}")
     find_package(${packageName})
 
     if(NOT DEFINED ${packageName}_FOUND)
         message(SEND_ERROR "${packageName}_FOUND not defined!")
     endif()
 endforeach()
 
 add_executable(dummy main.c)