diff --git a/addons/backtracebrowser/CMakeLists.txt b/addons/backtracebrowser/CMakeLists.txt
--- a/addons/backtracebrowser/CMakeLists.txt
+++ b/addons/backtracebrowser/CMakeLists.txt
@@ -29,4 +29,6 @@
 install( TARGETS katebacktracebrowserplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
 
 ############# unit tests ################
-ecm_optional_add_subdirectory (autotests)
+if (BUILD_TESTING)
+    add_subdirectory(autotests)
+endif()
diff --git a/addons/filetree/CMakeLists.txt b/addons/filetree/CMakeLists.txt
--- a/addons/filetree/CMakeLists.txt
+++ b/addons/filetree/CMakeLists.txt
@@ -27,4 +27,6 @@
 kcoreaddons_desktop_to_json (katefiletreeplugin katefiletreeplugin.desktop)
 
 ############# unit tests ################
-ecm_optional_add_subdirectory (autotests)
+if (BUILD_TESTING)
+    add_subdirectory(autotests)
+endif()
diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
--- a/addons/project/CMakeLists.txt
+++ b/addons/project/CMakeLists.txt
@@ -47,4 +47,6 @@
 install( FILES kateproject.example DESTINATION  ${DATA_INSTALL_DIR}/kateproject )
 
 ############# unit tests ################
-ecm_optional_add_subdirectory (autotests)
+if (BUILD_TESTING)
+    add_subdirectory(autotests)
+endif()
diff --git a/kate/CMakeLists.txt b/kate/CMakeLists.txt
--- a/kate/CMakeLists.txt
+++ b/kate/CMakeLists.txt
@@ -149,4 +149,6 @@
 ecm_install_icons(ICONS ${KATE_ICONS_PNG} ${KATE_ICONS_SVG} DESTINATION ${ICON_INSTALL_DIR} THEME hicolor)
 
 # automatic unit tests
-ecm_optional_add_subdirectory (autotests)
+if (BUILD_TESTING)
+    add_subdirectory(autotests)
+endif()