diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f3efe6c5d..8d9a57592 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,99 +1,98 @@
 ###
 # Create config.ini file for tests
 ###
 set(abs_top_srcdir ${CMAKE_SOURCE_DIR})
 set(abs_top_builddir ${CMAKE_BINARY_DIR})
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 	set(EXEEXT ".exe")
 endif()
 
 if(NOT BUILD_BITCOIN_WALLET)
 	set(ENABLE_WALLET_TRUE "#")
 endif()
 
 if(NOT BUILD_BITCOIN_TX OR NOT BUILD_BITCOIN_TX)
 	set(BUILD_BITCOIN_UTILS_TRUE "#")
 endif()
 if(NOT BUILD_BITCOIN_ZMQ)
 	set(ENABLE_ZMQ_TRUE "#")
 endif()
 
 # Create build ini file
 configure_file(config.ini.in config.ini @ONLY)
 
 
 ###
 # Setup symlinks for testing
 ###
 macro(make_link src dest)
-  add_custom_command(
-    OUTPUT "${dest}"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "${src}" "${dest}"
-    COMMENT "make_link ${src} -> ${dest}"
-    MAIN_DEPENDENCY "${src}"
-  )
+	add_custom_command(
+		OUTPUT "${dest}"
+		COMMAND ${CMAKE_COMMAND} -E create_symlink "${src}" "${dest}"
+		COMMENT "make_link ${src} -> ${dest}"
+		MAIN_DEPENDENCY "${src}"
+	)
 endmacro()
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/functional/)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/util/)
 
 make_link(
 	${CMAKE_CURRENT_SOURCE_DIR}/functional/test_runner.py
 	${CMAKE_CURRENT_BINARY_DIR}/functional/test_runner.py
 )
 make_link(
 	${CMAKE_CURRENT_SOURCE_DIR}/util/bitcoin-util-test.py
 	${CMAKE_CURRENT_BINARY_DIR}/util/bitcoin-util-test.py
 )
 make_link(
 	${CMAKE_CURRENT_SOURCE_DIR}/util/rpcauth-test.py
 	${CMAKE_CURRENT_BINARY_DIR}/util/rpcauth-test.py
 )
 
 add_custom_target(check-functional
+	COMMENT "Run functional tests..."
 	COMMAND
 		"${PYTHON_EXECUTABLE}"
 		./functional/test_runner.py
 	DEPENDS
 		../src/bitcoind
 		../src/bitcoin-cli
 		${CMAKE_CURRENT_BINARY_DIR}/functional/test_runner.py
 	USES_TERMINAL
 )
 
 add_dependencies(check-all check-functional)
 
 if(BUILD_BITCOIN_TX)
 	add_custom_target(check-bitcoin-util
-		COMMAND
-			${CMAKE_COMMAND} -E echo "Running test/util/bitcoin-util-test.py..."
+		COMMENT "Test Bitcoin utilities..."
 		COMMAND
 			"${PYTHON_EXECUTABLE}"
 			./util/bitcoin-util-test.py
 		DEPENDS
 			../src/bitcoin-tx
 			${CMAKE_CURRENT_BINARY_DIR}/util/bitcoin-util-test.py
 	)
 
 	add_dependencies(check check-bitcoin-util)
 endif()
 
 add_custom_target(check-rpcauth
-	COMMAND
-		${CMAKE_COMMAND} -E echo "Running test/util/rpcauth-test.py..."
+	COMMENT "Test Bitcoin RPC authentication..."
 	COMMAND
 		"${PYTHON_EXECUTABLE}"
 		./util/rpcauth-test.py
 	DEPENDS
 		${CMAKE_CURRENT_BINARY_DIR}/util/rpcauth-test.py
 )
 
 add_dependencies(check check-rpcauth)
 
 include(PackageHelper)
 exclude_from_source_package(
 	# Subdirectories
 	"cache/"
 	"lint/"
 	"sanitizer_suppressions/"
 )