diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e99afca4e8b..041506d9e33 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -59,6 +59,13 @@ if (BUILD_TESTS)
                 DEPENDS cppcheck validateCFG)
     endif()
 
+    # TODO: the target name "test" is reservered by CTest
+    #add_custom_target(test $<TARGET_FILE:testrunner>
+    #        DEPENDS cppcheck testrunner)
+
+    add_custom_target(check $<TARGET_FILE:testrunner> -q
+            DEPENDS cppcheck testrunner)
+
     if (REGISTER_TESTS)
         # CMP0064 requires 3.4
         # CMAKE_MATCH_<n> usage for if (MATCHES) requires 3.9
@@ -71,7 +78,7 @@ if (BUILD_TESTS)
         ProcessorCount(N)
         set(CTEST_PARALLEL_LEVEL ${N} CACHE STRING "CTest parallel level")
         set(CTEST_TIMEOUT 90 CACHE STRING "CTest timeout")
-        add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout ${CTEST_TIMEOUT}
+        add_custom_target(check-ctest ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout ${CTEST_TIMEOUT}
                 DEPENDS testrunner cppcheck)
 
         set(SKIP_TESTS "" CACHE STRING "A list of tests to skip")
@@ -80,7 +87,7 @@ if (BUILD_TESTS)
             if (${NAME} IN_LIST SKIP_TESTS)
             elseif(TEST ${NAME})
             else()
-                add_test(NAME ${NAME} COMMAND testrunner ${NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+                add_test(NAME ${NAME} COMMAND $<TARGET_FILE:testrunner> ${NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
             endif()
         endfunction()