diff --git a/filters/stage/powerpoint/CMakeLists.txt b/filters/stage/powerpoint/CMakeLists.txt
--- a/filters/stage/powerpoint/CMakeLists.txt
+++ b/filters/stage/powerpoint/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 include_directories(
     ../../libmso
diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
--- a/libs/flake/CMakeLists.txt
+++ b/libs/flake/CMakeLists.txt
@@ -3,7 +3,9 @@
 include_directories(${FLAKE_INCLUDES} )
 
 add_subdirectory(styles)
-add_subdirectory(tests)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 add_subdirectory(pics)
 
 set(flake_SRCS
diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
--- a/libs/odf/CMakeLists.txt
+++ b/libs/odf/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 add_subdirectory( writeodf )
 
 include_directories( ${KOODF_INCLUDES} )
diff --git a/libs/pageapp/CMakeLists.txt b/libs/pageapp/CMakeLists.txt
--- a/libs/pageapp/CMakeLists.txt
+++ b/libs/pageapp/CMakeLists.txt
@@ -2,7 +2,9 @@
     ${KOPAGEAPP_INCLUDES}
 )
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 add_subdirectory(tools)
 
 ### kopageapp ###
diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
--- a/libs/pigment/CMakeLists.txt
+++ b/libs/pigment/CMakeLists.txt
@@ -34,8 +34,10 @@
     endif ()
 endif()
 
-add_subdirectory(tests)
-add_subdirectory(benchmarks)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+    add_subdirectory(benchmarks)
+endif()
 
 set(pigmentcms_SRCS
     DebugPigment.cpp
diff --git a/libs/rdf/CMakeLists.txt b/libs/rdf/CMakeLists.txt
--- a/libs/rdf/CMakeLists.txt
+++ b/libs/rdf/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 kde_enable_exceptions()
 
diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
--- a/libs/store/CMakeLists.txt
+++ b/libs/store/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 
 ########### libkostore ###############
 
diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
--- a/libs/text/CMakeLists.txt
+++ b/libs/text/CMakeLists.txt
@@ -2,8 +2,10 @@
                     ${FONTCONFIG_INCLUDE_DIR}
                     ${FREETYPE_INCLUDE_DIRS})
 
-add_subdirectory( tests )
-add_subdirectory( styles/tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+    add_subdirectory( styles/tests )
+endif()
 
 ########### next target ###############
 set(kotext_LIB_SRCS
diff --git a/libs/textlayout/CMakeLists.txt b/libs/textlayout/CMakeLists.txt
--- a/libs/textlayout/CMakeLists.txt
+++ b/libs/textlayout/CMakeLists.txt
@@ -1,6 +1,8 @@
 include_directories(${TEXTLAYOUT_INCLUDES})
 
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 ########### next target ###############
 set(textlayout_LIB_SRCS
diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
--- a/libs/widgets/CMakeLists.txt
+++ b/libs/widgets/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 add_subdirectory( pics )
 
 include_directories(${KOTEXT_INCLUDES} ${KOODF_INCLUDES} ${PIGMENT_INCLUDES})
diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
--- a/libs/widgetutils/CMakeLists.txt
+++ b/libs/widgetutils/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(tests)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 
 set(kowidgetutils_LIB_SRCS
     KoGroupButton.cpp
diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
--- a/plan/CMakeLists.txt
+++ b/plan/CMakeLists.txt
@@ -46,7 +46,9 @@
 add_subdirectory( pics )
 add_subdirectory( toolbar )
 add_subdirectory( plugins )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 add_subdirectory( workpackage )
 
diff --git a/plan/libs/kernel/CMakeLists.txt b/plan/libs/kernel/CMakeLists.txt
--- a/plan/libs/kernel/CMakeLists.txt
+++ b/plan/libs/kernel/CMakeLists.txt
@@ -1,5 +1,7 @@
 
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 include_directories(${KOODF_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/libs/widgetutils
diff --git a/plan/libs/models/CMakeLists.txt b/plan/libs/models/CMakeLists.txt
--- a/plan/libs/models/CMakeLists.txt
+++ b/plan/libs/models/CMakeLists.txt
@@ -1,5 +1,7 @@
 
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 include_directories(
     ../kernel 
diff --git a/plan/plugins/schedulers/rcps/CMakeLists.txt b/plan/plugins/schedulers/rcps/CMakeLists.txt
--- a/plan/plugins/schedulers/rcps/CMakeLists.txt
+++ b/plan/plugins/schedulers/rcps/CMakeLists.txt
@@ -4,7 +4,9 @@
 include_directories( ${LIBRCPS_INCLUDE_DIR} ${KOODF_INCLUDES} ${CMAKE_SOURCE_DIR}/plan/libs/kernel  )
 
 add_subdirectory( 3rdparty )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 set ( RCPSScheduler_SRCS
     KPlatoRCPSPlugin.cpp
diff --git a/plan/plugins/schedulers/tj/CMakeLists.txt b/plan/plugins/schedulers/tj/CMakeLists.txt
--- a/plan/plugins/schedulers/tj/CMakeLists.txt
+++ b/plan/plugins/schedulers/tj/CMakeLists.txt
@@ -4,7 +4,9 @@
 include_directories( ${LIBTJ_INCLUDE_DIR} ${KOODF_INCLUDES} ${CMAKE_SOURCE_DIR}/plan/libs/kernel  )
 
 #add_subdirectory( taskjuggler )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 set ( TJScheduler_SRCS
     PlanTJPlugin.cpp
diff --git a/plan/plugins/scripting/CMakeLists.txt b/plan/plugins/scripting/CMakeLists.txt
--- a/plan/plugins/scripting/CMakeLists.txt
+++ b/plan/plugins/scripting/CMakeLists.txt
@@ -7,7 +7,9 @@
 )
 
 add_subdirectory( scripts )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 set(krossmoduleplan_PART_SRCS
     Account.cpp
diff --git a/plugins/chartshape/CMakeLists.txt b/plugins/chartshape/CMakeLists.txt
--- a/plugins/chartshape/CMakeLists.txt
+++ b/plugins/chartshape/CMakeLists.txt
@@ -6,7 +6,9 @@
 endif ()
 
 
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 
 include_directories( ${CMAKE_SOURCE_DIR}/plugins/chartshape
diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
--- a/plugins/colorengines/lcms2/CMakeLists.txt
+++ b/plugins/colorengines/lcms2/CMakeLists.txt
@@ -1,8 +1,8 @@
 project( lcmsengine )
 
-if(NOT WIN32)
+if(BUILD_TESTING AND NOT WIN32)
 ## Only test if on non-Windows system
-	add_subdirectory(tests)
+    add_subdirectory(tests)
 endif()
 
 add_subdirectory(data)
diff --git a/plugins/formulashape/CMakeLists.txt b/plugins/formulashape/CMakeLists.txt
--- a/plugins/formulashape/CMakeLists.txt
+++ b/plugins/formulashape/CMakeLists.txt
@@ -126,5 +126,7 @@
 add_subdirectory( pics ) 
 # TODO: those font files seem unused currently, investigate if still needed
 # add_subdirectory( fonts )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 add_subdirectory( templates )
diff --git a/plugins/musicshape/CMakeLists.txt b/plugins/musicshape/CMakeLists.txt
--- a/plugins/musicshape/CMakeLists.txt
+++ b/plugins/musicshape/CMakeLists.txt
@@ -8,7 +8,9 @@
 add_subdirectory( fonts )
 add_subdirectory( pics )
 add_subdirectory( core )
-add_subdirectory( tests)
+if(BUILD_TESTING)
+    add_subdirectory( tests)
+endif()
 
 ########### Flake Plugin library ###############
 
diff --git a/plugins/musicshape/core/CMakeLists.txt b/plugins/musicshape/core/CMakeLists.txt
--- a/plugins/musicshape/core/CMakeLists.txt
+++ b/plugins/musicshape/core/CMakeLists.txt
@@ -1,2 +1,4 @@
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
diff --git a/plugins/textediting/spellcheck/CMakeLists.txt b/plugins/textediting/spellcheck/CMakeLists.txt
--- a/plugins/textediting/spellcheck/CMakeLists.txt
+++ b/plugins/textediting/spellcheck/CMakeLists.txt
@@ -2,7 +2,9 @@
 
 add_definitions(-DTRANSLATION_DOMAIN=\"calligra_textediting_spellcheck\")
 
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 include_directories(   ${TEXTLAYOUT_INCLUDES} ${FLAKE_INCLUDES} )
 
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
--- a/sheets/CMakeLists.txt
+++ b/sheets/CMakeLists.txt
@@ -21,7 +21,9 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"calligrasheets\")
 
 add_subdirectory( data )
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 add_subdirectory( dtd )
 add_subdirectory( functions )
 
diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
--- a/stage/part/CMakeLists.txt
+++ b/stage/part/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 include_directories( ${KOMAIN_INCLUDES} ${KOPAGEAPP_INCLUDES} ${Boost_INCLUDE_DIR})
 
-if (NOT WIN32) ## Disable tests in Windows whilst they break builds
+if (BUILD_TESTING AND NOT WIN32) ## Disable tests in Windows whilst they break builds
     add_subdirectory(tests)
 endif()
 add_subdirectory(tools)
diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt
--- a/words/part/CMakeLists.txt
+++ b/words/part/CMakeLists.txt
@@ -1,7 +1,9 @@
 project(wordspart)
 
 #TODO port to textlayout-rework
-add_subdirectory( tests )
+if(BUILD_TESTING)
+    add_subdirectory( tests )
+endif()
 
 include_directories( ${KORDF_INCLUDES} ${KOTEXT_INCLUDES} ${TEXTLAYOUT_INCLUDES})