diff --git a/kmymoney/CMakeLists.txt b/kmymoney/CMakeLists.txt
--- a/kmymoney/CMakeLists.txt
+++ b/kmymoney/CMakeLists.txt
@@ -47,7 +47,9 @@
 add_subdirectory( misc )
 add_subdirectory( payeeidentifier )
 add_subdirectory( icons )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+  add_subdirectory( tests )
+endif()
 
 set( _HEADERS kmymoneyutils.h kmymoneyglobalsettings.h )
 
diff --git a/kmymoney/converter/CMakeLists.txt b/kmymoney/converter/CMakeLists.txt
--- a/kmymoney/converter/CMakeLists.txt
+++ b/kmymoney/converter/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory( tests )
+if(BUILD_TESTING)
+  add_subdirectory( tests )
+endif()
 
 set (libconverter_a_SOURCES
   mymoneygncreader.cpp
diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.txt
--- a/kmymoney/mymoney/CMakeLists.txt
+++ b/kmymoney/mymoney/CMakeLists.txt
@@ -92,4 +92,6 @@
 
 ############## tests ####################
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
diff --git a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt b/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
--- a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
+++ b/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
@@ -49,4 +49,6 @@
   Qt5::Core
 )
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
diff --git a/kmymoney/mymoney/storage/CMakeLists.txt b/kmymoney/mymoney/storage/CMakeLists.txt
--- a/kmymoney/mymoney/storage/CMakeLists.txt
+++ b/kmymoney/mymoney/storage/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
 set(storage_HEADERS
   imymoneystorage.h imymoneyserialize.h imymoneystorageformat.h
diff --git a/kmymoney/mymoney/tests/CMakeLists.txt b/kmymoney/mymoney/tests/CMakeLists.txt
--- a/kmymoney/mymoney/tests/CMakeLists.txt
+++ b/kmymoney/mymoney/tests/CMakeLists.txt
@@ -1,13 +1,11 @@
 include(ECMAddTests)
 
-if(BUILD_TESTING)
-  add_library(kmm_testutils STATIC mymoneytestutils.cpp)
-  target_link_libraries(kmm_testutils
-    PUBLIC
-      Qt5::Core
-      kmm_mymoney
-  )
-endif()
+add_library(kmm_testutils STATIC mymoneytestutils.cpp)
+target_link_libraries(kmm_testutils
+  PUBLIC
+    Qt5::Core
+    kmm_mymoney
+)
 
 file(GLOB tests_sources "*-test.cpp")
 ecm_add_tests(${tests_sources}
diff --git a/kmymoney/payeeidentifier/ibanandbic/CMakeLists.txt b/kmymoney/payeeidentifier/ibanandbic/CMakeLists.txt
--- a/kmymoney/payeeidentifier/ibanandbic/CMakeLists.txt
+++ b/kmymoney/payeeidentifier/ibanandbic/CMakeLists.txt
@@ -64,5 +64,7 @@
   DESTINATION ${SERVICES_INSTALL_DIR}
   )
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 add_subdirectory(widgets)
diff --git a/kmymoney/plugins/csvimport/CMakeLists.txt b/kmymoney/plugins/csvimport/CMakeLists.txt
--- a/kmymoney/plugins/csvimport/CMakeLists.txt
+++ b/kmymoney/plugins/csvimport/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
 # patch the version with the version defined in the build system
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/csvimport.json.in ${CMAKE_CURRENT_BINARY_DIR}/csvimport.json @ONLY)
diff --git a/kmymoney/plugins/csvimport/tests/CMakeLists.txt b/kmymoney/plugins/csvimport/tests/CMakeLists.txt
--- a/kmymoney/plugins/csvimport/tests/CMakeLists.txt
+++ b/kmymoney/plugins/csvimport/tests/CMakeLists.txt
@@ -1,16 +1,14 @@
 include(ECMAddTests)
 
-if(BUILD_TESTING)
-  add_library(csvimport_testcommon STATIC
-    csvimporttestcommon.cpp
-  )
+add_library(csvimport_testcommon STATIC
+  csvimporttestcommon.cpp
+)
 
-  target_link_libraries(csvimport_testcommon
-    PUBLIC
-    Qt5::Core
-    kmm_mymoney
-  )
-endif()
+target_link_libraries(csvimport_testcommon
+  PUBLIC
+  Qt5::Core
+  kmm_mymoney
+)
 
 file(GLOB tests_sources "*-test.cpp")
 ecm_add_tests(${tests_sources}
diff --git a/kmymoney/plugins/sqlcipher/CMakeLists.txt b/kmymoney/plugins/sqlcipher/CMakeLists.txt
--- a/kmymoney/plugins/sqlcipher/CMakeLists.txt
+++ b/kmymoney/plugins/sqlcipher/CMakeLists.txt
@@ -58,7 +58,9 @@
   ${SQLCIPHER_LIBRARIES}
 )
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
 #### Install files ####
 
diff --git a/kmymoney/reports/CMakeLists.txt b/kmymoney/reports/CMakeLists.txt
--- a/kmymoney/reports/CMakeLists.txt
+++ b/kmymoney/reports/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
 set (libreports_a_SOURCES
   kreportchartview.cpp
diff --git a/kmymoney/reports/tests/CMakeLists.txt b/kmymoney/reports/tests/CMakeLists.txt
--- a/kmymoney/reports/tests/CMakeLists.txt
+++ b/kmymoney/reports/tests/CMakeLists.txt
@@ -1,15 +1,13 @@
 include(ECMAddTests)
 
-if(BUILD_TESTING)
-  add_library(reports_testcommon STATIC
-    reportstestcommon.cpp
-  )
-  target_link_libraries(reports_testcommon
-    PUBLIC
-    Qt5::Core
-    reports
-  )
-endif()
+add_library(reports_testcommon STATIC
+  reportstestcommon.cpp
+)
+target_link_libraries(reports_testcommon
+  PUBLIC
+  Qt5::Core
+  reports
+)
 
 file(GLOB tests_sources "*-test.cpp")
 ecm_add_tests(${tests_sources}
@@ -22,7 +20,5 @@
     reports_testcommon
 )
 
-if(BUILD_TESTING)
-  add_executable(reports-chart-test chart-test.cpp)
-  target_link_libraries(reports-chart-test reports Qt5::Core Qt5::Gui)
-endif()
+add_executable(reports-chart-test chart-test.cpp)
+target_link_libraries(reports-chart-test reports Qt5::Core Qt5::Gui)