diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6dd2bcd1..f9a733c1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,4 @@
-if(${CMAKE_VERSION} VERSION_GREATER "3.4")
-    CMAKE_MINIMUM_REQUIRED (VERSION 3.5)
-else()
-    CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)
-    IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
-        (CMAKE_VERSION VERSION_EQUAL 3.1))
-        CMAKE_POLICY(SET CMP0054 NEW)
-    ENDIF ()
-endif()
+CMAKE_MINIMUM_REQUIRED (VERSION 3.5...4.0)
 
 PROJECT (msgpack-cxx LANGUAGES CXX)
 
@@ -164,10 +156,10 @@ IF (MSGPACK_BUILD_TESTS)
         MESSAGE(FATAL_ERROR "Test requires -DMSGPACK_USE_BOOST=ON")
     ENDIF ()
     ENABLE_TESTING ()
+    INCLUDE (CTest)
     # MEMORYCHECK_COMMAND_OPTIONS needs to place prior to CTEST_MEMORYCHECK_COMMAND
     SET (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1")
     FIND_PROGRAM (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
-    INCLUDE (Dart)
     ADD_SUBDIRECTORY (test)
 ENDIF ()
 
diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake
index d24c2b586..0d2da28c1 100644
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -48,7 +48,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 
     # Show info where to find the report
     ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-        COMMAND ;
+        COMMAND ${CMAKE_COMMAND} -E echo ""
         COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
     )