diff --git a/languages/cpp/parser/rpp/tests/CMakeLists.txt b/languages/cpp/parser/rpp/tests/CMakeLists.txt
index 9e14b4b..7a04bf4 100644
--- a/languages/cpp/parser/rpp/tests/CMakeLists.txt
+++ b/languages/cpp/parser/rpp/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories( ${KDevelop_SOURCE_DIR}/languages/cpp/parser ${CMAKE_CURRENT_SOURCE_DIR}/..  )
 
 add_executable(pp main.cpp)
+ecm_mark_as_test(pp)
 target_link_libraries(pp  KDev::Tests KDev::Language kdevcpprpp)
 
diff --git a/projectmanagers/cmake/tests/CMakeLists.txt b/projectmanagers/cmake/tests/CMakeLists.txt
index 451f22d..f768c67 100644
--- a/projectmanagers/cmake/tests/CMakeLists.txt
+++ b/projectmanagers/cmake/tests/CMakeLists.txt
@@ -26,4 +26,5 @@ kdevcmake_add_test(test_cmakemanager KDev::Language KDev::Tests KDev::Project)
 
 # this is not a unit test but a testing tool, kept here for convenience
 add_executable(kdevprojectopen kdevprojectopen.cpp)
+ecm_mark_as_test(kdevprojectopen)
 target_link_libraries(kdevprojectopen Qt5::Test KDev::Project KDev::Tests kdevcmakecommon)
diff --git a/projectmanagers/custom-buildsystem/tests/CMakeLists.txt b/projectmanagers/custom-buildsystem/tests/CMakeLists.txt
index 60bbf9e..4c8d9f7 100644
--- a/projectmanagers/custom-buildsystem/tests/CMakeLists.txt
+++ b/projectmanagers/custom-buildsystem/tests/CMakeLists.txt
@@ -17,4 +17,5 @@ ki18n_wrap_ui( kcm_uitest_SRCS
                         ../custombuildsystemconfigwidget.ui
                  )
 add_executable( kcm_uitest ${kcm_uitest_SRCS} )
+ecm_mark_as_test( kcm_uitest )
 target_link_libraries( kcm_uitest KF5::KDELibs4Support KDev::Project KDev::Tests )
diff --git a/projectmanagers/custommake/makefileresolver/CMakeLists.txt b/projectmanagers/custommake/makefileresolver/CMakeLists.txt
index 81802bd..5fa45fd 100644
--- a/projectmanagers/custommake/makefileresolver/CMakeLists.txt
+++ b/projectmanagers/custommake/makefileresolver/CMakeLists.txt
@@ -9,8 +9,12 @@ add_library(kdevmakefileresolver STATIC
 target_link_libraries(kdevmakefileresolver
   KDev::Interfaces KDev::Project
   Qt5::Core Qt5::Gui KDev::Language
-  KDev::Tests
 )
+
+if(BUILD_TESTING)
+    target_link_libraries(kdevmakefileresolver KDev::Tests)
+endif()
+
 set_target_properties(kdevmakefileresolver PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 option(BUILD_kdev_makefileresolver "Build the makefile resolver debugging tool" OFF)