diff --git a/CMakeLists.txt b/CMakeLists.txt
index 205cf7b..23dc376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.10)
 set (CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 set (HAVE_CMAKE true)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 180543d..6692943 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.10)
 message ("-- Configuring man pages")
 set (man_FILES tasksh.1)
 foreach (man_FILE ${man_FILES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 787640d..802399f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.10)
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/libshared/src
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3c1db94..068fc73 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,9 +1,7 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.10)
 
-# See this CMake issue before complaining about the following.
-# https://cmake.org/Bug/view.php?id=16062
 if(POLICY CMP0037)
-  cmake_policy(SET CMP0037 OLD)
+  cmake_policy(SET CMP0037 NEW)
 endif()
 
 include_directories (${CMAKE_SOURCE_DIR}
@@ -17,7 +15,7 @@ link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
 set (test_SRCS)
 
-add_custom_target (test ./run_all --verbose
+add_custom_target (tasksh-test ./run_all --verbose
                         DEPENDS ${test_SRCS}
                         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test)