diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@
 include(ECMMarkNonGuiExecutable)
 include(ECMOptionalAddSubdirectory)
 include(ECMQtDeclareLoggingCategory)
+include(ECMAddTests)
 include(ECMMarkAsTest)
 include(CMakePackageConfigHelpers)
 include(WriteBasicConfigVersionFile)
diff --git a/src/tests/backtraceparsertest/CMakeLists.txt b/src/tests/backtraceparsertest/CMakeLists.txt
--- a/src/tests/backtraceparsertest/CMakeLists.txt
+++ b/src/tests/backtraceparsertest/CMakeLists.txt
@@ -1,11 +1,11 @@
-add_executable( backtraceparsertest fakebacktracegenerator.cpp backtraceparsertest.cpp)
-target_link_libraries( backtraceparsertest Qt5::Test Qt5::Core KF5::KIOWidgets drkonqi_backtrace_parser)
-ecm_mark_as_test(backtraceparsertest)
-add_test(backtraceparsertest backtraceparsertest)
-
+ecm_add_test(fakebacktracegenerator.cpp backtraceparsertest.cpp
+    TEST_NAME backtraceparsertest
+    LINK_LIBRARIES Qt5::Test Qt5::Core KF5::KIOWidgets drkonqi_backtrace_parser
+)
 add_executable(backtraceparsertest_manual fakebacktracegenerator.cpp backtraceparsertest_manual.cpp)
 target_link_libraries(backtraceparsertest_manual Qt5::Core KF5::I18n KF5::KIOWidgets drkonqi_backtrace_parser)
 ecm_mark_as_test(backtraceparsertest_manual)
+ecm_mark_nongui_executable(backtraceparsertest_manual)
 
 # create a link so that the data directory can be accessed from the build directory, where the test runs
 if( NOT WIN32 )
diff --git a/src/tests/crashtest/CMakeLists.txt b/src/tests/crashtest/CMakeLists.txt
--- a/src/tests/crashtest/CMakeLists.txt
+++ b/src/tests/crashtest/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(crashtest crashtest.cpp)
 ecm_mark_as_test(crashtest)
-
+ecm_mark_nongui_executable(crashtest)
 target_link_libraries(crashtest
     KF5::I18n KF5::Crash KF5::CoreAddons Qt5::Widgets
     Qt5::Concurrent)