diff --git a/catkin_tools/jobs/catkin.py b/catkin_tools/jobs/catkin.py
index 021b46c7..d2403416 100644
--- a/catkin_tools/jobs/catkin.py
+++ b/catkin_tools/jobs/catkin.py
@@ -732,7 +732,7 @@ def create_catkin_test_job(
 
 # CMakeLists.txt for prebuild package
 SETUP_PREBUILD_CMAKELISTS_TEMPLATE = """\
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(catkin_tools_prebuild)
 
 find_package(catkin QUIET)
diff --git a/docs/examples/failure_ws/src/catkin_pkg_cmake_err/CMakeLists.txt b/docs/examples/failure_ws/src/catkin_pkg_cmake_err/CMakeLists.txt
index d1fa42c2..c5dbda28 100644
--- a/docs/examples/failure_ws/src/catkin_pkg_cmake_err/CMakeLists.txt
+++ b/docs/examples/failure_ws/src/catkin_pkg_cmake_err/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(catkin_pkg_cmake_err)
 
 ## Find catkin macros and libraries
diff --git a/docs/examples/failure_ws/src/catkin_pkg_cmake_warn/CMakeLists.txt b/docs/examples/failure_ws/src/catkin_pkg_cmake_warn/CMakeLists.txt
index 9aa8275c..24777e10 100644
--- a/docs/examples/failure_ws/src/catkin_pkg_cmake_warn/CMakeLists.txt
+++ b/docs/examples/failure_ws/src/catkin_pkg_cmake_warn/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(catkin_pkg_cmake_warn)
 
 ## Find catkin macros and libraries
diff --git a/docs/examples/failure_ws/src/catkin_pkg_make_err/CMakeLists.txt b/docs/examples/failure_ws/src/catkin_pkg_make_err/CMakeLists.txt
index a39a2771..f7178978 100644
--- a/docs/examples/failure_ws/src/catkin_pkg_make_err/CMakeLists.txt
+++ b/docs/examples/failure_ws/src/catkin_pkg_make_err/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(catkin_pkg_make_err)
 
 ## Find catkin macros and libraries
diff --git a/docs/examples/failure_ws/src/catkin_pkg_make_warn/CMakeLists.txt b/docs/examples/failure_ws/src/catkin_pkg_make_warn/CMakeLists.txt
index 1141fe3b..774fdfe5 100644
--- a/docs/examples/failure_ws/src/catkin_pkg_make_warn/CMakeLists.txt
+++ b/docs/examples/failure_ws/src/catkin_pkg_make_warn/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(catkin_pkg_make_warn)
 
 ## Find catkin macros and libraries
diff --git a/tests/system/resources/catkin_pkgs/build_type_condition/CMakeLists.txt b/tests/system/resources/catkin_pkgs/build_type_condition/CMakeLists.txt
index a96ca4af..6c02f764 100644
--- a/tests/system/resources/catkin_pkgs/build_type_condition/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/build_type_condition/CMakeLists.txt
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(build_type_condition)
diff --git a/tests/system/resources/catkin_pkgs/cmake_args/CMakeLists.txt b/tests/system/resources/catkin_pkgs/cmake_args/CMakeLists.txt
index 50c3a19b..ba8cd5a2 100644
--- a/tests/system/resources/catkin_pkgs/cmake_args/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/cmake_args/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(cmake_args)
 
 find_package(catkin REQUIRED)
@@ -16,4 +16,3 @@ endif()
 if(NOT VAR3)
   message(SEND_ERROR "VAR3 NOT DEFINED!")
 endif()
-
diff --git a/tests/system/resources/catkin_pkgs/cmake_err/CMakeLists.txt b/tests/system/resources/catkin_pkgs/cmake_err/CMakeLists.txt
index 1a121fc4..ad2570c8 100644
--- a/tests/system/resources/catkin_pkgs/cmake_err/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/cmake_err/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(cmake_err)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tests/system/resources/catkin_pkgs/cmake_warning/CMakeLists.txt b/tests/system/resources/catkin_pkgs/cmake_warning/CMakeLists.txt
index 1dd5b7dd..85e7e48a 100644
--- a/tests/system/resources/catkin_pkgs/cmake_warning/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/cmake_warning/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(cmake_warning)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tests/system/resources/catkin_pkgs/depend_condition/CMakeLists.txt b/tests/system/resources/catkin_pkgs/depend_condition/CMakeLists.txt
index a96ca4af..6c02f764 100644
--- a/tests/system/resources/catkin_pkgs/depend_condition/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/depend_condition/CMakeLists.txt
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(build_type_condition)
diff --git a/tests/system/resources/catkin_pkgs/make_err/CMakeLists.txt b/tests/system/resources/catkin_pkgs/make_err/CMakeLists.txt
index 61838587..e55ffcbd 100644
--- a/tests/system/resources/catkin_pkgs/make_err/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/make_err/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(make_err)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tests/system/resources/catkin_pkgs/make_warning/CMakeLists.txt b/tests/system/resources/catkin_pkgs/make_warning/CMakeLists.txt
index 3ee32913..5833e132 100644
--- a/tests/system/resources/catkin_pkgs/make_warning/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/make_warning/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(make_warning)
 find_package(catkin REQUIRED)
 catkin_package()
diff --git a/tests/system/resources/catkin_pkgs/products_0/CMakeLists.txt b/tests/system/resources/catkin_pkgs/products_0/CMakeLists.txt
index e94326fb..fdf7d8a0 100644
--- a/tests/system/resources/catkin_pkgs/products_0/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/products_0/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(products_0)
 find_package(catkin REQUIRED)
 
diff --git a/tests/system/resources/catkin_pkgs/products_unicode/CMakeLists.txt b/tests/system/resources/catkin_pkgs/products_unicode/CMakeLists.txt
index f71deaa2..85cb54d6 100644
--- a/tests/system/resources/catkin_pkgs/products_unicode/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/products_unicode/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(products_unicode)
 find_package(catkin REQUIRED)
 
diff --git a/tests/system/resources/catkin_pkgs/python_pkg/CMakeLists.txt b/tests/system/resources/catkin_pkgs/python_pkg/CMakeLists.txt
index 55e81aaa..7b119bc0 100644
--- a/tests/system/resources/catkin_pkgs/python_pkg/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/python_pkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(python_pkg)
 find_package(catkin REQUIRED)
 
diff --git a/tests/system/resources/catkin_pkgs/python_tests/CMakeLists.txt b/tests/system/resources/catkin_pkgs/python_tests/CMakeLists.txt
index 6b37ecaa..432ea76a 100644
--- a/tests/system/resources/catkin_pkgs/python_tests/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/python_tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(python_tests)
 find_package(catkin REQUIRED)
 
diff --git a/tests/system/resources/catkin_pkgs/python_tests_err/CMakeLists.txt b/tests/system/resources/catkin_pkgs/python_tests_err/CMakeLists.txt
index a095f571..1da8010f 100644
--- a/tests/system/resources/catkin_pkgs/python_tests_err/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/python_tests_err/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(python_tests_err)
 find_package(catkin REQUIRED)
 
diff --git a/tests/system/resources/catkin_pkgs/python_tests_targets/CMakeLists.txt b/tests/system/resources/catkin_pkgs/python_tests_targets/CMakeLists.txt
index 4e349acd..fb2b25c3 100644
--- a/tests/system/resources/catkin_pkgs/python_tests_targets/CMakeLists.txt
+++ b/tests/system/resources/catkin_pkgs/python_tests_targets/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(python_tests_targets)
 find_package(catkin REQUIRED)
 
diff --git a/tests/system/resources/cmake_pkgs/app_pkg/CMakeLists.txt b/tests/system/resources/cmake_pkgs/app_pkg/CMakeLists.txt
index 7e230479..6c973300 100644
--- a/tests/system/resources/cmake_pkgs/app_pkg/CMakeLists.txt
+++ b/tests/system/resources/cmake_pkgs/app_pkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(app_pkg)
 
 find_package(lib_pkg REQUIRED)
diff --git a/tests/system/resources/cmake_pkgs/cmake_pkg/CMakeLists.txt b/tests/system/resources/cmake_pkgs/cmake_pkg/CMakeLists.txt
index bbcf8764..3d74869d 100644
--- a/tests/system/resources/cmake_pkgs/cmake_pkg/CMakeLists.txt
+++ b/tests/system/resources/cmake_pkgs/cmake_pkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(cmake_pkg)
 
 add_executable(vanilla vanilla.cpp)
@@ -7,4 +7,3 @@ install(TARGETS vanilla
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib/static)
-
diff --git a/tests/system/resources/cmake_pkgs/lib_pkg/CMakeLists.txt b/tests/system/resources/cmake_pkgs/lib_pkg/CMakeLists.txt
index c421623b..d2057a6c 100644
--- a/tests/system/resources/cmake_pkgs/lib_pkg/CMakeLists.txt
+++ b/tests/system/resources/cmake_pkgs/lib_pkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(lib_pkg)
 
 # make cache variables for install destinations
diff --git a/tests/system/resources/cmake_pkgs/test_err_pkg/CMakeLists.txt b/tests/system/resources/cmake_pkgs/test_err_pkg/CMakeLists.txt
index b68158d5..14d866ec 100644
--- a/tests/system/resources/cmake_pkgs/test_err_pkg/CMakeLists.txt
+++ b/tests/system/resources/cmake_pkgs/test_err_pkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(test_err_pkg)
 
 include(CTest)
diff --git a/tests/system/resources/cmake_pkgs/test_pkg/CMakeLists.txt b/tests/system/resources/cmake_pkgs/test_pkg/CMakeLists.txt
index b55a2b25..5d2e488b 100644
--- a/tests/system/resources/cmake_pkgs/test_pkg/CMakeLists.txt
+++ b/tests/system/resources/cmake_pkgs/test_pkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(test_pkg)
 
 include(CTest)
diff --git a/tests/system/resources/ros_pkgs/pkg_with_roslint/CMakeLists.txt b/tests/system/resources/ros_pkgs/pkg_with_roslint/CMakeLists.txt
index bf01b7f6..f03f7b8d 100644
--- a/tests/system/resources/ros_pkgs/pkg_with_roslint/CMakeLists.txt
+++ b/tests/system/resources/ros_pkgs/pkg_with_roslint/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(pkg_with_roslint)
 find_package(catkin REQUIRED COMPONENTS roslint)
 catkin_package()
diff --git a/tests/system/workspace_factory.py b/tests/system/workspace_factory.py
index a0d9bac6..7170d560 100644
--- a/tests/system/workspace_factory.py
+++ b/tests/system/workspace_factory.py
@@ -52,16 +52,17 @@ class Package(object):
   </export>"""
 
         CATKIN_CMAKELISTS_TEMPLATE = """
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project({name})
 find_package(catkin REQUIRED COMPONENTS {catkin_components})
 catkin_package()"""
 
         CMAKE_CMAKELISTS_TEMPLATE = """
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project({name})
 {find_packages}
-add_custom_target(install)"""
+install(FILES ${{CMAKE_CURRENT_SOURCE_DIR}}/package.xml DESTINATION share/${{PROJECT_NAME}})
+"""
 
         CMAKE_CMAKELISTS_FIND_PACKAGE_TEMPLATE = """
 find_package({name})"""