diff --git a/applets/systemtray/CMakeLists.txt b/applets/systemtray/CMakeLists.txt
index 243d02faa..4b5540b7f 100644
--- a/applets/systemtray/CMakeLists.txt
+++ b/applets/systemtray/CMakeLists.txt
@@ -27,4 +27,6 @@ target_link_libraries(org.kde.plasma.private.systemtray
 install(TARGETS org.kde.plasma.private.systemtray DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
 
 add_subdirectory(container)
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
diff --git a/kioslave/desktop/CMakeLists.txt b/kioslave/desktop/CMakeLists.txt
index 6620e0dd3..7c9197be7 100644
--- a/kioslave/desktop/CMakeLists.txt
+++ b/kioslave/desktop/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kio_desktop\")
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
 add_library(kio_desktop MODULE kio_desktop.cpp)
 
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index 3cf37cd49..5820c7b1d 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -100,5 +100,7 @@ endif ()
 install(TARGETS plasma_engine_clipboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
 install(FILES plasma-dataengine-clipboard.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 install(FILES org.kde.plasma.clipboard.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services)
+if(BUILD_TESTING)
+   add_subdirectory(autotests)
+endif()
 
-add_subdirectory(autotests)
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 23af7de3f..eeb356104 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -8,7 +8,9 @@ configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmse
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_subdirectory(logout-greeter)
 add_subdirectory(switchuser-greeter)
-add_subdirectory(tests)
+if(BUILD_TESTING)
+   add_subdirectory(tests)
+endif()
 
 ########### next target ###############
 
diff --git a/ksmserver/logout-greeter/CMakeLists.txt b/ksmserver/logout-greeter/CMakeLists.txt
index 0527f120b..ad329e5ea 100644
--- a/ksmserver/logout-greeter/CMakeLists.txt
+++ b/ksmserver/logout-greeter/CMakeLists.txt
@@ -16,4 +16,6 @@ target_link_libraries(ksmserver-logout-greeter
 )
 install(TARGETS ksmserver-logout-greeter DESTINATION ${KDE_INSTALL_LIBEXECDIR})
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
diff --git a/libcolorcorrect/CMakeLists.txt b/libcolorcorrect/CMakeLists.txt
index 5809318a7..71fae306e 100644
--- a/libcolorcorrect/CMakeLists.txt
+++ b/libcolorcorrect/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_subdirectory(declarative)
 add_subdirectory(kded)
-add_subdirectory(autotests)
+if(BUILD_TESTING)
+   add_subdirectory(autotests)
+endif()
 
 set(colorcorrect_LIB_SRCS
     compositorcoloradaptor.cpp
diff --git a/libtaskmanager/CMakeLists.txt b/libtaskmanager/CMakeLists.txt
index 588809ce3..0be8fdaa4 100644
--- a/libtaskmanager/CMakeLists.txt
+++ b/libtaskmanager/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_subdirectory(declarative)
-add_subdirectory(autotests)
+if(BUILD_TESTING)
+   add_subdirectory(autotests)
+endif()
 
 set(taskmanager_LIB_SRCS
     abstracttasksmodel.cpp
diff --git a/runners/bookmarks/CMakeLists.txt b/runners/bookmarks/CMakeLists.txt
index 76ef3dc4a..2c2bac1c1 100644
--- a/runners/bookmarks/CMakeLists.txt
+++ b/runners/bookmarks/CMakeLists.txt
@@ -44,4 +44,6 @@ install(TARGETS krunner_bookmarksrunner DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 install(FILES plasma-runner-bookmarks.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 # Currently tests include only chrome, so no need to get include them if json is not found
-add_subdirectory(tests)
+if(BUILD_TESTING)
+   add_subdirectory(tests)
+endif()
diff --git a/runners/services/CMakeLists.txt b/runners/services/CMakeLists.txt
index 4d1874dce..27b95d11f 100644
--- a/runners/services/CMakeLists.txt
+++ b/runners/services/CMakeLists.txt
@@ -34,4 +34,6 @@ install(TARGETS krunner_services DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 install(FILES plasma-runner-services.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
-add_subdirectory(autotests)
+if(BUILD_TESTING)
+   add_subdirectory(autotests)
+endif()
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 04ad01aee..4e21da8d5 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -112,4 +112,6 @@ install(FILES
    DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
 
 add_subdirectory(packageplugins)
-add_subdirectory(autotests)
+if(BUILD_TESTING)
+   add_subdirectory(autotests)
+endif()
diff --git a/wallpapers/image/CMakeLists.txt b/wallpapers/image/CMakeLists.txt
index ba404f22c..0a3365454 100644
--- a/wallpapers/image/CMakeLists.txt
+++ b/wallpapers/image/CMakeLists.txt
@@ -27,7 +27,9 @@ target_link_libraries(plasma_wallpaper_imageplugin
          KF5::GuiAddons
          )
 
-add_subdirectory(autotests)
+if(BUILD_TESTING)
+   add_subdirectory(autotests)
+endif()
 
 install(TARGETS plasma_wallpaper_imageplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/wallpapers/image)