diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3839ac93..21ae0323 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,64 +1,64 @@
 include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/3rdparty)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/testlib")
 
 MACRO(ZANSHIN_MANUAL_TESTS)
   set(prefix "${CMAKE_CURRENT_SOURCE_DIR}")
   string(REPLACE "${CMAKE_SOURCE_DIR}" "" prefix "${prefix}")
   string(REPLACE "/" "-" prefix "${prefix}")
   string(REPLACE "\\" "-" prefix "${prefix}")
   string(LENGTH "${prefix}" prefix_length)
   string(SUBSTRING "${prefix}" 1 ${prefix_length}-1 prefix)
 
   FOREACH(_testname ${ARGN})
     set(_prefixed_testname "${prefix}-${_testname}")
     add_executable(${_prefixed_testname} ${_testname}.cpp ${CMAKE_SOURCE_DIR}/src/zanshin/app/dependencies.cpp)
     kde_enable_exceptions()
     target_link_libraries(${_prefixed_testname}
       Qt5::Test
 
       akonadi
       domain
       presentation
       scripting
       utils
       widgets
     )
   ENDFOREACH(_testname)
 ENDMACRO(ZANSHIN_MANUAL_TESTS)
 
 MACRO(ZANSHIN_AUTO_TESTS)
   set(prefix "${CMAKE_CURRENT_SOURCE_DIR}")
   string(REPLACE "${CMAKE_SOURCE_DIR}" "" prefix "${prefix}")
   string(REPLACE "/" "-" prefix "${prefix}")
   string(REPLACE "\\" "-" prefix "${prefix}")
   string(LENGTH "${prefix}" prefix_length)
   string(SUBSTRING "${prefix}" 1 ${prefix_length}-1 prefix)
 
   FOREACH(_testname ${ARGN})
     set(_prefixed_testname "${prefix}-${_testname}")
     add_executable(${_prefixed_testname} ${_testname}.cpp)
-    add_test(${_prefixed_testname} ${_prefixed_testname})
+    add_test(NAME ${_prefixed_testname} COMMAND ${_prefixed_testname})
     kde_enable_exceptions()
     target_link_libraries(${_prefixed_testname}
       Qt5::Test
 
       testlib
       akonadi
       domain
       presentation
       scripting
       utils
       widgets
       KF5::AkonadiXml
     )
   ENDFOREACH(_testname)
 ENDMACRO(ZANSHIN_AUTO_TESTS)
 
 add_subdirectory(features)
 add_subdirectory(manual)
 add_subdirectory(benchmarks)
 add_subdirectory(testlib)
 add_subdirectory(units)
diff --git a/tests/features/renku/CMakeLists.txt b/tests/features/renku/CMakeLists.txt
index 05c3f81e..8c339437 100644
--- a/tests/features/renku/CMakeLists.txt
+++ b/tests/features/renku/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_subdirectory(features)
 
 add_executable(tests-features-renku ../features-run.cpp)
-add_test(tests-features-renku tests-features-renku)
+add_test(NAME tests-features-renku COMMAND tests-features-renku)
 add_definitions(-DUSER_XMLDATA="${CMAKE_CURRENT_SOURCE_DIR}/../testenv/data/testdata.xml"
                 -DCUKE_STEPS="${CMAKE_CURRENT_BINARY_DIR}/features/step_definitions/renku-cuke-steps"
                 -DFEATURES_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 target_link_libraries(tests-features-renku
     Qt5::Core
     Qt5::Network
 )
 # Don't run this at the same time as tests-features-zanshin
 set_tests_properties(tests-features-renku PROPERTIES RUN_SERIAL TRUE)
diff --git a/tests/features/zanshin/CMakeLists.txt b/tests/features/zanshin/CMakeLists.txt
index 4e5a6ba2..7b438ee1 100644
--- a/tests/features/zanshin/CMakeLists.txt
+++ b/tests/features/zanshin/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_subdirectory(features)
 
 add_executable(tests-features-zanshin ../features-run.cpp)
-add_test(tests-features-zanshin tests-features-zanshin)
+add_test(NAME tests-features-zanshin COMMAND tests-features-zanshin)
 add_definitions(-DUSER_XMLDATA="${CMAKE_CURRENT_SOURCE_DIR}/../testenv/data/testdata.xml"
                 -DCUKE_STEPS="${CMAKE_CURRENT_BINARY_DIR}/features/step_definitions/zanshin-cuke-steps"
                 -DFEATURES_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 target_link_libraries(tests-features-zanshin
     Qt5::Core
     Qt5::Network
 )
diff --git a/tests/testlib/MacroAkonadiAutoTests.cmake b/tests/testlib/MacroAkonadiAutoTests.cmake
index 36890054..850e7fed 100644
--- a/tests/testlib/MacroAkonadiAutoTests.cmake
+++ b/tests/testlib/MacroAkonadiAutoTests.cmake
@@ -1,41 +1,41 @@
 set(_akonaditest_source_dir ${CMAKE_CURRENT_LIST_DIR})
 
 MACRO(ZANSHIN_AKONADI_AUTO_TESTS)
   set(prefix "${CMAKE_CURRENT_SOURCE_DIR}")
   string(REPLACE "${CMAKE_SOURCE_DIR}" "" prefix "${prefix}")
   string(REPLACE "/" "-" prefix "${prefix}")
   string(REPLACE "\\" "-" prefix "${prefix}")
   string(LENGTH "${prefix}" prefix_length)
   string(SUBSTRING "${prefix}" 1 ${prefix_length}-1 prefix)
 
   FOREACH(_testname ${ARGN})
     set(_prefixed_testname "${prefix}-${_testname}")
     add_executable(${_prefixed_testname} ${_testname}.cpp)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
     target_link_libraries(${_prefixed_testname} Qt5::Test akonadi domain utils)
 
     set(_location "${CMAKE_CURRENT_BINARY_DIR}/${_prefixed_testname}")
     if (WIN32)
       set(_executable "${_location}.exe")
     else (WIN32)
       set(_executable "${_location}")
     endif (WIN32)
 
     find_program(_testrunner akonaditest)
 
     set(AKONADITEST_CWD "${CMAKE_CURRENT_SOURCE_DIR}")
     set(zanshin-testcommand "${_executable}")
     configure_file(${_akonaditest_source_dir}/akonaditest-run.sh.in ${_prefixed_testname}-run.sh)
 
     set(akonaditest-run-cmd "${_testrunner}" -c "${CMAKE_CURRENT_SOURCE_DIR}/testenv/config.xml"
                             sh "${CMAKE_CURRENT_BINARY_DIR}/${_prefixed_testname}-run.sh" 2> "${CMAKE_CURRENT_BINARY_DIR}/akonaditest-${_prefixed_testname}.log")
 
     add_custom_target(${_prefixed_testname}-run
                       COMMAND ${akonaditest-run-cmd}
                       WORKING_DIRECTORY ${AKONADITEST_CWD}
                       USES_TERMINAL
     )
 
-    add_test(${_prefixed_testname} ${CMAKE_MAKE_PROGRAM} -C "${CMAKE_BINARY_DIR}" ${_prefixed_testname}-run)
+    add_test(NAME ${_prefixed_testname} COMMAND ${CMAKE_MAKE_PROGRAM} -C "${CMAKE_BINARY_DIR}" ${_prefixed_testname}-run)
   ENDFOREACH(_testname)
 ENDMACRO(ZANSHIN_AKONADI_AUTO_TESTS)