diff --git a/addons/backtracebrowser/CMakeLists.txt b/addons/backtracebrowser/CMakeLists.txt
index 1e2d6861d..72e7afb5f 100644
--- a/addons/backtracebrowser/CMakeLists.txt
+++ b/addons/backtracebrowser/CMakeLists.txt
@@ -1,32 +1,34 @@
 ########### next target ###############
 add_definitions(-DTRANSLATION_DOMAIN=\"katebacktracebrowserplugin\")
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 
 set(katebacktracebrowserplugin_PART_SRCS
     katebacktracebrowser.cpp
     btparser.cpp
     btfileindexer.cpp
     btdatabase.cpp
 )
 
 set(katebacktracebrowserplugin_PART_UI
     btbrowserwidget.ui
     btconfigwidget.ui
 )
 ki18n_wrap_ui(katebacktracebrowserplugin_PART_SRCS ${katebacktracebrowserplugin_PART_UI} )
 add_library(katebacktracebrowserplugin MODULE ${katebacktracebrowserplugin_PART_SRCS})
 
 # we compile in the .desktop file
 kcoreaddons_desktop_to_json (katebacktracebrowserplugin katebacktracebrowserplugin.desktop)
 
 target_link_libraries(katebacktracebrowserplugin
     KF5::TextEditor
     KF5::I18n
 )
 
 ########### install files ###############
 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
index 8027b3d6a..985f0a1d8 100644
--- a/addons/filetree/CMakeLists.txt
+++ b/addons/filetree/CMakeLists.txt
@@ -1,30 +1,32 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"katefiletree\")
 project(katefiletreeplugin)
 
 set(katefiletree_PART_SRCS katefiletree.cpp katefiletreemodel.cpp katefiletreeproxymodel.cpp )
 set(katefiletreeplugin_PART_SRCS katefiletreeplugin.cpp katefiletreeconfigpage.cpp katefiletreepluginsettings.cpp )
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 
 add_library (katefiletree STATIC  ${katefiletree_PART_SRCS})
 set_target_properties(katefiletree PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 target_link_libraries(katefiletree
 PUBLIC
   KF5::TextEditor
   KF5::I18n
   KF5::GuiAddons
   KF5::IconThemes
 )
 
 # resource for ui file and stuff
 qt5_add_resources(katefiletreeplugin_PART_SRCS plugin.qrc)
 
 add_library (katefiletreeplugin MODULE  ${katefiletreeplugin_PART_SRCS})
 target_link_libraries(katefiletreeplugin katefiletree)
 
 install(TARGETS katefiletreeplugin  DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
 
 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
index 12a0ff735..15a73e997 100644
--- a/addons/project/CMakeLists.txt
+++ b/addons/project/CMakeLists.txt
@@ -1,50 +1,52 @@
 project(kateprojectplugin)
 
 find_package(KF5NewStuff ${KF5_DEP_VERSION} REQUIRED) # For KMoreTools
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kateproject\")
 set(kateprojectplugin_PART_SRCS
   fileutil.cpp
   kateprojectplugin.cpp
   kateprojectpluginview.cpp
   kateproject.cpp
   kateprojectworker.cpp
   kateprojectitem.cpp
   kateprojectview.cpp
   kateprojectviewtree.cpp
   kateprojecttreeviewcontextmenu.cpp
   kateprojectinfoview.cpp
   kateprojectcompletion.cpp
   kateprojectindex.cpp
   kateprojectinfoviewindex.cpp
   kateprojectinfoviewterminal.cpp
   kateprojectinfoviewcodeanalysis.cpp
   kateprojectinfoviewnotes.cpp
   kateprojectconfigpage.cpp
   kateprojectcodeanalysistool.cpp
   tools/kateprojectcodeanalysistoolcppcheck.cpp
   tools/kateprojectcodeanalysistoolflake8.cpp
   tools/kateprojectcodeanalysisselector.cpp
 )
 
 # resource for ui file and stuff
 qt5_add_resources(kateprojectplugin_PART_SRCS plugin.qrc)
 
 add_library(kateprojectplugin MODULE ${kateprojectplugin_PART_SRCS})
 kcoreaddons_desktop_to_json (kateprojectplugin kateprojectplugin.desktop)
 target_link_libraries(kateprojectplugin
     KF5::TextEditor
     KF5::Parts KF5::I18n
     KF5::GuiAddons
     KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
     KF5::NewStuff # For KMoreTools
 )
 
 ########### install files ###############
 install(TARGETS kateprojectplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
 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
index 988345515..92d9111c0 100644
--- a/kate/CMakeLists.txt
+++ b/kate/CMakeLists.txt
@@ -1,152 +1,154 @@
 #
 # The Kate Application
 #
 project(kate)
 
 # Load the frameworks we need
 find_package(KF5 REQUIRED COMPONENTS DBusAddons GuiAddons)
 
 # includes
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/session
   ${CMAKE_CURRENT_SOURCE_DIR}/qtsingleapplication
 )
 
 # collect the needed source files
 set (KATE_LIBRARY_SRCS
    kateappadaptor.cpp
    kateapp.cpp
    kateconfigdialog.cpp
    kateconfigplugindialogpage.cpp
    katedocmanager.cpp
    katemainwindow.cpp
    katepluginmanager.cpp
    kateviewmanager.cpp
    kateviewspace.cpp
    katesavemodifieddialog.cpp
    katemwmodonhddialog.cpp
    katecolorschemechooser.cpp
 
    katetabbutton.cpp
    katetabbar.cpp
 
    # session
    session/katesessionchooser.cpp
    session/katesessionsaction.cpp
    session/katesessionmanager.cpp
    session/katesessionmanagedialog.cpp
    session/katesessionopendialog.cpp
    session/katesession.cpp
 
    katemdi.cpp
    katerunninginstanceinfo.cpp
    katequickopen.cpp
    katewaiter.h
 )
 
 ki18n_wrap_ui(KATE_LIBRARY_SRCS
     ui/sessionconfigwidget.ui
 )
 
 qt5_add_resources( KATE_LIBRARY_SRCS data/kate.qrc )
 
 add_library(kdeinit_kate STATIC ${KATE_LIBRARY_SRCS})
 target_link_libraries(kdeinit_kate
 PUBLIC
     KF5::TextEditor
     KF5::I18n
     KF5::IconThemes
     KF5::WindowSystem
     KF5::GuiAddons
     KF5::DBusAddons
     KF5::Crash)
 
 if(KF5Activities_FOUND)
     target_link_libraries(kdeinit_kate
     PUBLIC
     KF5::Activities)
 endif()
 
 generate_export_header(kdeinit_kate
   EXPORT_FILE_NAME kateprivate_export.h
   EXPORT_MACRO_NAME KATE_TESTS_EXPORT
 )
 
 # collect icons
 set(KATE_ICONS_PNG
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/16-apps-kate.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/22-apps-kate.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/32-apps-kate.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/48-apps-kate.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/64-apps-kate.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/128-apps-kate.png
 )
 
 set(KATE_ICONS_SVG
 ${CMAKE_CURRENT_SOURCE_DIR}/icons/sc-apps-kate.svgz
 )
 
 # application only sources
 set (KATE_APP_SRCS
     main.cpp
 )
 
 # use single application instead of dbus on mac + windows
 if (APPLE OR WIN32)
     set(singleapp_SRCS
         qtsingleapplication/qtlocalpeer.cpp
         qtsingleapplication/qtsingleapplication.cpp
         qtsingleapplication/qtlockedfile.cpp
     )
 
     if(WIN32)
         set(singleapp_SRCS ${singleapp_SRCS} qtsingleapplication/qtlockedfile_win.cpp)
     else()
         set(singleapp_SRCS ${singleapp_SRCS} qtsingleapplication/qtlockedfile_unix.cpp)
     endif()
 
     add_definitions("-DUSE_QT_SINGLE_APP")
 
     set(KATE_APP_SRCS ${KATE_APP_SRCS} ${singleapp_SRCS})
 endif()
 
 # add icons to application sources, to have them bundled
 ecm_add_app_icon(KATE_APP_SRCS ICONS ${KATE_ICONS_PNG})
 
 # create executable
 add_executable(kate ${KATE_APP_SRCS})
 target_link_libraries(kate kdeinit_kate)
 
 # own plist magic for mac os
 if(APPLE)
     # own plist template
     set_target_properties (kate PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/data/MacOSXBundleInfo.plist.in)
 
     # the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake,
     # so has to be set for all targets in this cmake file
     set(MACOSX_BUNDLE_DISPLAY_NAME Kate)
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Kate")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Kate")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "Kate")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_INFO_STRING "Kate - Advanced Text Editor")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "Kate ${KDE_APPLICATIONS_VERSION}")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDE_APPLICATIONS_VERSION}")
     set_target_properties(kate PROPERTIES MACOSX_BUNDLE_COPYRIGHT "2000-2016 The Kate Authors")
 endif()
 
 # install executable
 install(TARGETS kate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 # desktop file
 install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/data/org.kde.kate.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR})
 
 # appdata
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.kde.kate.appdata.xml DESTINATION  ${CMAKE_INSTALL_METAINFODIR})
 
 # install icons
 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()