diff --git a/CMakeLists.txt b/CMakeLists.txt
index 601386777..6ec014a75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(boost)
 
+option(BUILD_TESTING "Build the test suite" OFF)
+
 macro(find_package NAME)
     if(NOT "${NAME}" MATCHES "^boost_.*$" AND NOT "${NAME}" STREQUAL BCM)
         _find_package(${ARGV})
diff --git a/bcm/CMakeLists.txt b/bcm/CMakeLists.txt
index 94936bb4e..e6957721d 100644
--- a/bcm/CMakeLists.txt
+++ b/bcm/CMakeLists.txt
@@ -4,4 +4,4 @@ install(DIRECTORY share DESTINATION .)
 
 enable_testing()
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C ${CMAKE_CFG_INTDIR})
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/bcm/share/bcm/cmake/BCMTest.cmake b/bcm/share/bcm/cmake/BCMTest.cmake
index 2ebc13834..75c57abbb 100644
--- a/bcm/share/bcm/cmake/BCMTest.cmake
+++ b/bcm/share/bcm/cmake/BCMTest.cmake
@@ -82,6 +82,9 @@ endfunction()
 
 
 function(bcm_test)
+    if(NOT BUILD_TESTING)
+        return()
+    endif()
     set(options COMPILE_ONLY WILL_FAIL NO_TEST_LIBS)
     set(oneValueArgs NAME)
     set(multiValueArgs SOURCES CONTENT ARGS)
@@ -156,3 +159,10 @@ function(bcm_test_header)
         bcm_target_link_test_libs(${PARSE_NAME})
     endif()
 endfunction(bcm_test_header)
+
+
+function(bcm_add_test_subdirectory)
+if(BUILD_TESTING)
+    add_subdirectory(test)
+endif()
+endfunction()
\ No newline at end of file
diff --git a/libs/accumulators/CMakeLists.txt b/libs/accumulators/CMakeLists.txt
index 705f71600..03d3c0f48 100644
--- a/libs/accumulators/CMakeLists.txt
+++ b/libs/accumulators/CMakeLists.txt
@@ -4,6 +4,7 @@ project(boost_accumulators)
 find_package(BCM)
 include(BCMDeploy)
 include(BCMSetupVersion)
+include(BCMTest)
 
 find_package(boost_core)
 find_package(boost_static_assert)
@@ -56,4 +57,4 @@ target_link_libraries(boost_accumulators INTERFACE boost::typeof)
 
 bcm_deploy(TARGETS boost_accumulators INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/algorithm/CMakeLists.txt b/libs/algorithm/CMakeLists.txt
index ff95333b6..ef2b059e0 100644
--- a/libs/algorithm/CMakeLists.txt
+++ b/libs/algorithm/CMakeLists.txt
@@ -52,4 +52,4 @@ target_link_libraries(boost_algorithm INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_algorithm INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/align/CMakeLists.txt b/libs/align/CMakeLists.txt
index 6c94eec6b..cd3e3089b 100644
--- a/libs/align/CMakeLists.txt
+++ b/libs/align/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_align INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_align INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/any/CMakeLists.txt b/libs/any/CMakeLists.txt
index dbbf54947..6f943ebe0 100644
--- a/libs/any/CMakeLists.txt
+++ b/libs/any/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_any INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_any INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/array/CMakeLists.txt b/libs/array/CMakeLists.txt
index 4e01f1669..d766766cd 100644
--- a/libs/array/CMakeLists.txt
+++ b/libs/array/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_array INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_array INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/asio/CMakeLists.txt b/libs/asio/CMakeLists.txt
index dd24d0922..aa83b5234 100644
--- a/libs/asio/CMakeLists.txt
+++ b/libs/asio/CMakeLists.txt
@@ -54,4 +54,4 @@ endif()
 
 bcm_deploy(TARGETS boost_asio INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/assert/CMakeLists.txt b/libs/assert/CMakeLists.txt
index 203d2622c..22441005f 100644
--- a/libs/assert/CMakeLists.txt
+++ b/libs/assert/CMakeLists.txt
@@ -20,4 +20,4 @@ target_link_libraries(boost_assert INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_assert INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/assign/CMakeLists.txt b/libs/assign/CMakeLists.txt
index 582305289..0d015105f 100644
--- a/libs/assign/CMakeLists.txt
+++ b/libs/assign/CMakeLists.txt
@@ -36,4 +36,4 @@ target_link_libraries(boost_assign INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_assign INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/atomic/CMakeLists.txt b/libs/atomic/CMakeLists.txt
index a5b0b7348..8307ad298 100644
--- a/libs/atomic/CMakeLists.txt
+++ b/libs/atomic/CMakeLists.txt
@@ -26,4 +26,4 @@ target_include_directories(boost_atomic PRIVATE include)
 
 bcm_deploy(TARGETS boost_atomic INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/beast/CMakeLists.txt b/libs/beast/CMakeLists.txt
index 184c0b424..537d1ec2b 100644
--- a/libs/beast/CMakeLists.txt
+++ b/libs/beast/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_beast PROPERTY EXPORT_NAME beast)
 
 bcm_deploy(TARGETS boost_beast INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/bimap/CMakeLists.txt b/libs/bimap/CMakeLists.txt
index 69eea5910..6b5f35f60 100644
--- a/libs/bimap/CMakeLists.txt
+++ b/libs/bimap/CMakeLists.txt
@@ -48,4 +48,4 @@ target_link_libraries(boost_bimap INTERFACE boost::lambda)
 
 bcm_deploy(TARGETS boost_bimap INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/bind/CMakeLists.txt b/libs/bind/CMakeLists.txt
index f17ebc25b..99b8a7ee7 100644
--- a/libs/bind/CMakeLists.txt
+++ b/libs/bind/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_bind INTERFACE boost::core)
 
 bcm_deploy(TARGETS boost_bind INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/callable_traits/CMakeLists.txt b/libs/callable_traits/CMakeLists.txt
index 13dbf0abc..02b244427 100644
--- a/libs/callable_traits/CMakeLists.txt
+++ b/libs/callable_traits/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_callable_traits PROPERTY EXPORT_NAME callable_traits)
 
 bcm_deploy(TARGETS boost_callable_traits INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/chrono/CMakeLists.txt b/libs/chrono/CMakeLists.txt
index 5c2edafe6..177e256b1 100644
--- a/libs/chrono/CMakeLists.txt
+++ b/libs/chrono/CMakeLists.txt
@@ -52,4 +52,4 @@ target_include_directories(boost_chrono PRIVATE include)
 
 bcm_deploy(TARGETS boost_chrono INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/circular_buffer/CMakeLists.txt b/libs/circular_buffer/CMakeLists.txt
index 47d19ed8c..271db367b 100644
--- a/libs/circular_buffer/CMakeLists.txt
+++ b/libs/circular_buffer/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries(boost_circular_buffer INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_circular_buffer INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/compatibility/CMakeLists.txt b/libs/compatibility/CMakeLists.txt
index 2cdb9a95a..623d615b8 100644
--- a/libs/compatibility/CMakeLists.txt
+++ b/libs/compatibility/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_compatibility PROPERTY EXPORT_NAME compatibility)
 
 bcm_deploy(TARGETS boost_compatibility INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/compute/CMakeLists.txt b/libs/compute/CMakeLists.txt
index 0e297ffea..7c359d6be 100644
--- a/libs/compute/CMakeLists.txt
+++ b/libs/compute/CMakeLists.txt
@@ -72,4 +72,4 @@ target_link_libraries(boost_compute INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_compute INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/concept_check/CMakeLists.txt b/libs/concept_check/CMakeLists.txt
index f40ccb385..f5dc1c7db 100644
--- a/libs/concept_check/CMakeLists.txt
+++ b/libs/concept_check/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_concept_check INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_concept_check INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/config/CMakeLists.txt b/libs/config/CMakeLists.txt
index 43d660e1c..6208bd98b 100644
--- a/libs/config/CMakeLists.txt
+++ b/libs/config/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_config PROPERTY EXPORT_NAME config)
 
 bcm_deploy(TARGETS boost_config INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/container/CMakeLists.txt b/libs/container/CMakeLists.txt
index ba3eddaa5..4e84e356e 100644
--- a/libs/container/CMakeLists.txt
+++ b/libs/container/CMakeLists.txt
@@ -41,4 +41,4 @@ target_include_directories(boost_container PRIVATE include)
 
 bcm_deploy(TARGETS boost_container INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
index bd5873754..f8ad4e946 100644
--- a/libs/context/CMakeLists.txt
+++ b/libs/context/CMakeLists.txt
@@ -139,4 +139,4 @@ target_include_directories(boost_context PRIVATE include)
 
 bcm_deploy(TARGETS boost_context INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/conversion/CMakeLists.txt b/libs/conversion/CMakeLists.txt
index 79a619ce2..cc7feac04 100644
--- a/libs/conversion/CMakeLists.txt
+++ b/libs/conversion/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_conversion INTERFACE boost::smart_ptr)
 
 bcm_deploy(TARGETS boost_conversion INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/convert/CMakeLists.txt b/libs/convert/CMakeLists.txt
index 27791b0cb..487f18417 100644
--- a/libs/convert/CMakeLists.txt
+++ b/libs/convert/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries(boost_convert INTERFACE boost::math)
 
 bcm_deploy(TARGETS boost_convert INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/core/CMakeLists.txt b/libs/core/CMakeLists.txt
index 9f3ef70e9..5e0387ee5 100644
--- a/libs/core/CMakeLists.txt
+++ b/libs/core/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_core INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_core INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/coroutine/CMakeLists.txt b/libs/coroutine/CMakeLists.txt
index f8773a954..558e0c302 100644
--- a/libs/coroutine/CMakeLists.txt
+++ b/libs/coroutine/CMakeLists.txt
@@ -50,4 +50,4 @@ target_include_directories(boost_coroutine PRIVATE include)
 
 bcm_deploy(TARGETS boost_coroutine INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/coroutine2/CMakeLists.txt b/libs/coroutine2/CMakeLists.txt
index 61b62ab9f..34584d19b 100644
--- a/libs/coroutine2/CMakeLists.txt
+++ b/libs/coroutine2/CMakeLists.txt
@@ -26,4 +26,4 @@ target_link_libraries(boost_coroutine2 INTERFACE boost::context)
 
 bcm_deploy(TARGETS boost_coroutine2 INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/crc/CMakeLists.txt b/libs/crc/CMakeLists.txt
index cfde6b09b..bba4b042a 100644
--- a/libs/crc/CMakeLists.txt
+++ b/libs/crc/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_crc INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_crc INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/date_time/CMakeLists.txt b/libs/date_time/CMakeLists.txt
index d550b27ea..b45990350 100644
--- a/libs/date_time/CMakeLists.txt
+++ b/libs/date_time/CMakeLists.txt
@@ -48,4 +48,4 @@ target_link_libraries(boost_date_time PUBLIC boost::utility)
 
 bcm_deploy(TARGETS boost_date_time INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/detail/CMakeLists.txt b/libs/detail/CMakeLists.txt
index 45ddd0b87..d40919e67 100644
--- a/libs/detail/CMakeLists.txt
+++ b/libs/detail/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_detail INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_detail INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/disjoint_sets/CMakeLists.txt b/libs/disjoint_sets/CMakeLists.txt
index a86464c80..8f8a3121e 100644
--- a/libs/disjoint_sets/CMakeLists.txt
+++ b/libs/disjoint_sets/CMakeLists.txt
@@ -20,4 +20,4 @@ target_link_libraries(boost_disjoint_sets INTERFACE boost::graph)
 
 bcm_deploy(TARGETS boost_disjoint_sets INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/dll/CMakeLists.txt b/libs/dll/CMakeLists.txt
index 64516a431..ae0545b5b 100644
--- a/libs/dll/CMakeLists.txt
+++ b/libs/dll/CMakeLists.txt
@@ -50,4 +50,4 @@ endif()
 
 bcm_deploy(TARGETS boost_dll INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/dynamic_bitset/CMakeLists.txt b/libs/dynamic_bitset/CMakeLists.txt
index 78ecce06c..3256c8a32 100644
--- a/libs/dynamic_bitset/CMakeLists.txt
+++ b/libs/dynamic_bitset/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_dynamic_bitset INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_dynamic_bitset INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/endian/CMakeLists.txt b/libs/endian/CMakeLists.txt
index 38a57afc4..322fdbce1 100644
--- a/libs/endian/CMakeLists.txt
+++ b/libs/endian/CMakeLists.txt
@@ -34,4 +34,4 @@ target_link_libraries(boost_endian INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_endian INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/exception/CMakeLists.txt b/libs/exception/CMakeLists.txt
index ce31c729a..b085d2760 100644
--- a/libs/exception/CMakeLists.txt
+++ b/libs/exception/CMakeLists.txt
@@ -32,4 +32,4 @@ target_include_directories(boost_exception PRIVATE include)
 
 bcm_deploy(TARGETS boost_exception INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/fiber/CMakeLists.txt b/libs/fiber/CMakeLists.txt
index 8cccaa1f4..e44433e96 100644
--- a/libs/fiber/CMakeLists.txt
+++ b/libs/fiber/CMakeLists.txt
@@ -42,4 +42,4 @@ target_include_directories(boost_fiber PRIVATE include)
 
 bcm_deploy(TARGETS boost_fiber INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/filesystem/CMakeLists.txt b/libs/filesystem/CMakeLists.txt
index 0657d884f..8b6276c53 100644
--- a/libs/filesystem/CMakeLists.txt
+++ b/libs/filesystem/CMakeLists.txt
@@ -51,4 +51,4 @@ target_include_directories(boost_filesystem PRIVATE include)
 
 bcm_deploy(TARGETS boost_filesystem INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/flyweight/CMakeLists.txt b/libs/flyweight/CMakeLists.txt
index 84f48db18..fe37e60f6 100644
--- a/libs/flyweight/CMakeLists.txt
+++ b/libs/flyweight/CMakeLists.txt
@@ -46,4 +46,4 @@ target_link_libraries(boost_flyweight INTERFACE boost::smart_ptr)
 
 bcm_deploy(TARGETS boost_flyweight INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/foreach/CMakeLists.txt b/libs/foreach/CMakeLists.txt
index 681a17c99..9c0c52d10 100644
--- a/libs/foreach/CMakeLists.txt
+++ b/libs/foreach/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_foreach INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_foreach INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/format/CMakeLists.txt b/libs/format/CMakeLists.txt
index d95402e25..e2fca0fff 100644
--- a/libs/format/CMakeLists.txt
+++ b/libs/format/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_format INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_format INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/function/CMakeLists.txt b/libs/function/CMakeLists.txt
index 1aee8f33f..54253b002 100644
--- a/libs/function/CMakeLists.txt
+++ b/libs/function/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(boost_function INTERFACE boost::typeof)
 
 bcm_deploy(TARGETS boost_function INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/function_types/CMakeLists.txt b/libs/function_types/CMakeLists.txt
index 5368420c6..66a24ec3f 100644
--- a/libs/function_types/CMakeLists.txt
+++ b/libs/function_types/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_function_types INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_function_types INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/functional/CMakeLists.txt b/libs/functional/CMakeLists.txt
index 9e370511e..876a5e605 100644
--- a/libs/functional/CMakeLists.txt
+++ b/libs/functional/CMakeLists.txt
@@ -48,4 +48,4 @@ target_link_libraries(boost_functional INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_functional INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/fusion/CMakeLists.txt b/libs/fusion/CMakeLists.txt
index 403aee5f4..04c00da4e 100644
--- a/libs/fusion/CMakeLists.txt
+++ b/libs/fusion/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries(boost_fusion INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_fusion INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/geometry/CMakeLists.txt b/libs/geometry/CMakeLists.txt
index 92592ed5a..6820b9fd6 100644
--- a/libs/geometry/CMakeLists.txt
+++ b/libs/geometry/CMakeLists.txt
@@ -78,4 +78,4 @@ target_link_libraries(boost_geometry INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_geometry INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/gil/CMakeLists.txt b/libs/gil/CMakeLists.txt
index b712fbaa3..9b2064540 100644
--- a/libs/gil/CMakeLists.txt
+++ b/libs/gil/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(boost_gil INTERFACE boost::preprocessor)
 
 bcm_deploy(TARGETS boost_gil INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/graph/CMakeLists.txt b/libs/graph/CMakeLists.txt
index f79aebce9..959bcc053 100644
--- a/libs/graph/CMakeLists.txt
+++ b/libs/graph/CMakeLists.txt
@@ -105,4 +105,4 @@ target_include_directories(boost_graph PRIVATE include)
 
 bcm_deploy(TARGETS boost_graph INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/hana/CMakeLists.txt b/libs/hana/CMakeLists.txt
index f39d2e0b4..9361ebbe2 100644
--- a/libs/hana/CMakeLists.txt
+++ b/libs/hana/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_hana INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_hana INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/heap/CMakeLists.txt b/libs/heap/CMakeLists.txt
index 0c3ba1d7b..bfb278827 100644
--- a/libs/heap/CMakeLists.txt
+++ b/libs/heap/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(boost_heap INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_heap INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/icl/CMakeLists.txt b/libs/icl/CMakeLists.txt
index 68a6af1ae..c6c6477b0 100644
--- a/libs/icl/CMakeLists.txt
+++ b/libs/icl/CMakeLists.txt
@@ -46,4 +46,4 @@ target_link_libraries(boost_icl INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_icl INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/integer/CMakeLists.txt b/libs/integer/CMakeLists.txt
index 4bf1c3a18..a77460b9f 100644
--- a/libs/integer/CMakeLists.txt
+++ b/libs/integer/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_integer INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_integer INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/interprocess/CMakeLists.txt b/libs/interprocess/CMakeLists.txt
index 66b1792b2..079db17ee 100644
--- a/libs/interprocess/CMakeLists.txt
+++ b/libs/interprocess/CMakeLists.txt
@@ -48,4 +48,4 @@ endif()
 
 bcm_deploy(TARGETS boost_interprocess INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/intrusive/CMakeLists.txt b/libs/intrusive/CMakeLists.txt
index d009ee371..e2793d186 100644
--- a/libs/intrusive/CMakeLists.txt
+++ b/libs/intrusive/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_intrusive INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_intrusive INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/io/CMakeLists.txt b/libs/io/CMakeLists.txt
index 442ff5468..2eb62fcf7 100644
--- a/libs/io/CMakeLists.txt
+++ b/libs/io/CMakeLists.txt
@@ -20,4 +20,4 @@ target_link_libraries(boost_io INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_io INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/iostreams/CMakeLists.txt b/libs/iostreams/CMakeLists.txt
index 11396f5b0..6ece31a81 100644
--- a/libs/iostreams/CMakeLists.txt
+++ b/libs/iostreams/CMakeLists.txt
@@ -68,4 +68,4 @@ target_include_directories(boost_iostreams PRIVATE include)
 
 bcm_deploy(TARGETS boost_iostreams INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/iterator/CMakeLists.txt b/libs/iterator/CMakeLists.txt
index bba813b3a..4faf988b9 100644
--- a/libs/iterator/CMakeLists.txt
+++ b/libs/iterator/CMakeLists.txt
@@ -46,4 +46,4 @@ target_link_libraries(boost_iterator INTERFACE boost::conversion)
 
 bcm_deploy(TARGETS boost_iterator INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/lambda/CMakeLists.txt b/libs/lambda/CMakeLists.txt
index 6b0fb9af4..efa1686b7 100644
--- a/libs/lambda/CMakeLists.txt
+++ b/libs/lambda/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(boost_lambda INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_lambda INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/lexical_cast/CMakeLists.txt b/libs/lexical_cast/CMakeLists.txt
index 74f9c7b4c..f5d0fabc0 100644
--- a/libs/lexical_cast/CMakeLists.txt
+++ b/libs/lexical_cast/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(boost_lexical_cast INTERFACE boost::math)
 
 bcm_deploy(TARGETS boost_lexical_cast INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/local_function/CMakeLists.txt b/libs/local_function/CMakeLists.txt
index 51d26707d..9768d498f 100644
--- a/libs/local_function/CMakeLists.txt
+++ b/libs/local_function/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_local_function INTERFACE boost::preprocessor)
 
 bcm_deploy(TARGETS boost_local_function INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/locale/CMakeLists.txt b/libs/locale/CMakeLists.txt
index 6a1662ce9..a5d38c9c1 100644
--- a/libs/locale/CMakeLists.txt
+++ b/libs/locale/CMakeLists.txt
@@ -111,4 +111,4 @@ target_link_libraries(boost_locale PUBLIC boost::unordered)
 
 bcm_deploy(TARGETS boost_locale INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/lockfree/CMakeLists.txt b/libs/lockfree/CMakeLists.txt
index 1c186bc67..ab682f88f 100644
--- a/libs/lockfree/CMakeLists.txt
+++ b/libs/lockfree/CMakeLists.txt
@@ -46,4 +46,4 @@ target_link_libraries(boost_lockfree INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_lockfree INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/log/CMakeLists.txt b/libs/log/CMakeLists.txt
index 54e6dc858..4a9d31db0 100644
--- a/libs/log/CMakeLists.txt
+++ b/libs/log/CMakeLists.txt
@@ -248,4 +248,4 @@ target_include_directories(boost_log PRIVATE include)
 
 bcm_deploy(TARGETS boost_log INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/logic/CMakeLists.txt b/libs/logic/CMakeLists.txt
index 9c8450d4b..98c4a7d3f 100644
--- a/libs/logic/CMakeLists.txt
+++ b/libs/logic/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_logic INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_logic INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/math/CMakeLists.txt b/libs/math/CMakeLists.txt
index 2506dbe1c..12557d94e 100644
--- a/libs/math/CMakeLists.txt
+++ b/libs/math/CMakeLists.txt
@@ -129,4 +129,4 @@ endif()
 
 bcm_deploy(TARGETS boost_math boost_math_c99 boost_math_c99f boost_math_c99l boost_math_tr1 boost_math_tr1f boost_math_tr1l INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/metaparse/CMakeLists.txt b/libs/metaparse/CMakeLists.txt
index 5b8a5779b..e5f92befb 100644
--- a/libs/metaparse/CMakeLists.txt
+++ b/libs/metaparse/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_metaparse INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_metaparse INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/move/CMakeLists.txt b/libs/move/CMakeLists.txt
index 4469a0a72..41eff34c0 100644
--- a/libs/move/CMakeLists.txt
+++ b/libs/move/CMakeLists.txt
@@ -26,4 +26,4 @@ target_link_libraries(boost_move INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_move INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/mp11/CMakeLists.txt b/libs/mp11/CMakeLists.txt
index b9442bdf5..c4758e82b 100644
--- a/libs/mp11/CMakeLists.txt
+++ b/libs/mp11/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_mp11 PROPERTY EXPORT_NAME mp11)
 
 bcm_deploy(TARGETS boost_mp11 INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/mpl/CMakeLists.txt b/libs/mpl/CMakeLists.txt
index 01d23bf40..158d20eea 100644
--- a/libs/mpl/CMakeLists.txt
+++ b/libs/mpl/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_mpl INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_mpl INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/msm/CMakeLists.txt b/libs/msm/CMakeLists.txt
index 27fb24de5..e67ce08cc 100644
--- a/libs/msm/CMakeLists.txt
+++ b/libs/msm/CMakeLists.txt
@@ -52,4 +52,4 @@ target_link_libraries(boost_msm INTERFACE boost::typeof)
 
 bcm_deploy(TARGETS boost_msm INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/multi_array/CMakeLists.txt b/libs/multi_array/CMakeLists.txt
index 2258cd3e9..e52cac917 100644
--- a/libs/multi_array/CMakeLists.txt
+++ b/libs/multi_array/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(boost_multi_array INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_multi_array INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/multi_index/CMakeLists.txt b/libs/multi_index/CMakeLists.txt
index d3ba75b34..590a00276 100644
--- a/libs/multi_index/CMakeLists.txt
+++ b/libs/multi_index/CMakeLists.txt
@@ -56,4 +56,4 @@ target_link_libraries(boost_multi_index INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_multi_index INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/multiprecision/CMakeLists.txt b/libs/multiprecision/CMakeLists.txt
index 79ef21f1e..9e8081e46 100644
--- a/libs/multiprecision/CMakeLists.txt
+++ b/libs/multiprecision/CMakeLists.txt
@@ -50,4 +50,4 @@ target_link_libraries(boost_multiprecision INTERFACE boost::math)
 
 bcm_deploy(TARGETS boost_multiprecision INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/numeric/conversion/CMakeLists.txt b/libs/numeric/conversion/CMakeLists.txt
index 220bf8eb8..c00a56d77 100644
--- a/libs/numeric/conversion/CMakeLists.txt
+++ b/libs/numeric/conversion/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_numeric_conversion INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_numeric_conversion INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/numeric/interval/CMakeLists.txt b/libs/numeric/interval/CMakeLists.txt
index 321367117..04ab61852 100644
--- a/libs/numeric/interval/CMakeLists.txt
+++ b/libs/numeric/interval/CMakeLists.txt
@@ -24,4 +24,4 @@ target_link_libraries(boost_numeric_interval INTERFACE boost::detail)
 
 bcm_deploy(TARGETS boost_numeric_interval INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/numeric/odeint/CMakeLists.txt b/libs/numeric/odeint/CMakeLists.txt
index 95fe4f4af..5c60c5dfc 100644
--- a/libs/numeric/odeint/CMakeLists.txt
+++ b/libs/numeric/odeint/CMakeLists.txt
@@ -58,4 +58,4 @@ target_link_libraries(boost_numeric_odeint INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_numeric_odeint INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/numeric/ublas/CMakeLists.txt b/libs/numeric/ublas/CMakeLists.txt
index 2c7f9012b..b75837f5c 100644
--- a/libs/numeric/ublas/CMakeLists.txt
+++ b/libs/numeric/ublas/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(boost_numeric_ublas INTERFACE boost::smart_ptr)
 
 bcm_deploy(TARGETS boost_numeric_ublas INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/optional/CMakeLists.txt b/libs/optional/CMakeLists.txt
index a4c85abd5..6ff4929d4 100644
--- a/libs/optional/CMakeLists.txt
+++ b/libs/optional/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(boost_optional INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_optional INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/parameter/CMakeLists.txt b/libs/parameter/CMakeLists.txt
index 837362894..1a1aa0833 100644
--- a/libs/parameter/CMakeLists.txt
+++ b/libs/parameter/CMakeLists.txt
@@ -36,4 +36,4 @@ target_link_libraries(boost_parameter INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_parameter INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/phoenix/CMakeLists.txt b/libs/phoenix/CMakeLists.txt
index f66cbdaa7..14c8b7af3 100644
--- a/libs/phoenix/CMakeLists.txt
+++ b/libs/phoenix/CMakeLists.txt
@@ -48,4 +48,4 @@ target_link_libraries(boost_phoenix INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_phoenix INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/poly_collection/CMakeLists.txt b/libs/poly_collection/CMakeLists.txt
index 1eb17c180..d0a673283 100644
--- a/libs/poly_collection/CMakeLists.txt
+++ b/libs/poly_collection/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_poly_collection PROPERTY EXPORT_NAME poly_collection)
 
 bcm_deploy(TARGETS boost_poly_collection INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/polygon/CMakeLists.txt b/libs/polygon/CMakeLists.txt
index e6724a291..87aa26ea0 100644
--- a/libs/polygon/CMakeLists.txt
+++ b/libs/polygon/CMakeLists.txt
@@ -24,4 +24,4 @@ target_link_libraries(boost_polygon INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_polygon INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/pool/CMakeLists.txt b/libs/pool/CMakeLists.txt
index b00a31826..bdf06fd69 100644
--- a/libs/pool/CMakeLists.txt
+++ b/libs/pool/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(boost_pool INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_pool INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/predef/CMakeLists.txt b/libs/predef/CMakeLists.txt
index 211c9b14b..83b2e12f9 100644
--- a/libs/predef/CMakeLists.txt
+++ b/libs/predef/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_predef PROPERTY EXPORT_NAME predef)
 
 bcm_deploy(TARGETS boost_predef INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/preprocessor/CMakeLists.txt b/libs/preprocessor/CMakeLists.txt
index b73be1326..79ae8f4b5 100644
--- a/libs/preprocessor/CMakeLists.txt
+++ b/libs/preprocessor/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_preprocessor PROPERTY EXPORT_NAME preprocessor)
 
 bcm_deploy(TARGETS boost_preprocessor INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/process/CMakeLists.txt b/libs/process/CMakeLists.txt
index b18364c2c..0b7dd2054 100644
--- a/libs/process/CMakeLists.txt
+++ b/libs/process/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(boost_process INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_process INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/program_options/CMakeLists.txt b/libs/program_options/CMakeLists.txt
index 0c5055ed1..c56313ae5 100644
--- a/libs/program_options/CMakeLists.txt
+++ b/libs/program_options/CMakeLists.txt
@@ -56,4 +56,4 @@ target_include_directories(boost_program_options PRIVATE include)
 
 bcm_deploy(TARGETS boost_program_options INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/property_map/CMakeLists.txt b/libs/property_map/CMakeLists.txt
index ef73c94ae..762568df9 100644
--- a/libs/property_map/CMakeLists.txt
+++ b/libs/property_map/CMakeLists.txt
@@ -54,4 +54,4 @@ target_link_libraries(boost_property_map INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_property_map INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/property_tree/CMakeLists.txt b/libs/property_tree/CMakeLists.txt
index 5ed5771a0..0920b584f 100644
--- a/libs/property_tree/CMakeLists.txt
+++ b/libs/property_tree/CMakeLists.txt
@@ -50,4 +50,4 @@ target_link_libraries(boost_property_tree INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_property_tree INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/proto/CMakeLists.txt b/libs/proto/CMakeLists.txt
index ad4443e27..3f7249152 100644
--- a/libs/proto/CMakeLists.txt
+++ b/libs/proto/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(boost_proto INTERFACE boost::typeof)
 
 bcm_deploy(TARGETS boost_proto INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/ptr_container/CMakeLists.txt b/libs/ptr_container/CMakeLists.txt
index b5203ae9f..ceb6ecc78 100644
--- a/libs/ptr_container/CMakeLists.txt
+++ b/libs/ptr_container/CMakeLists.txt
@@ -46,4 +46,4 @@ target_link_libraries(boost_ptr_container INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_ptr_container INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/python/CMakeLists.txt b/libs/python/CMakeLists.txt
index b4a1c9f60..8cd3199f6 100644
--- a/libs/python/CMakeLists.txt
+++ b/libs/python/CMakeLists.txt
@@ -99,4 +99,4 @@ target_include_directories(boost_python PRIVATE include)
 
 bcm_deploy(TARGETS boost_python INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/qvm/CMakeLists.txt b/libs/qvm/CMakeLists.txt
index b5474dd3b..46a812f07 100644
--- a/libs/qvm/CMakeLists.txt
+++ b/libs/qvm/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_qvm INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_qvm INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/random/CMakeLists.txt b/libs/random/CMakeLists.txt
index 25861142f..472b1359a 100644
--- a/libs/random/CMakeLists.txt
+++ b/libs/random/CMakeLists.txt
@@ -44,4 +44,4 @@ target_include_directories(boost_random PRIVATE include)
 
 bcm_deploy(TARGETS boost_random INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/range/CMakeLists.txt b/libs/range/CMakeLists.txt
index 4c3ed8654..d46f731ba 100644
--- a/libs/range/CMakeLists.txt
+++ b/libs/range/CMakeLists.txt
@@ -52,4 +52,4 @@ target_link_libraries(boost_range INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_range INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/ratio/CMakeLists.txt b/libs/ratio/CMakeLists.txt
index f315b0472..30c47f52d 100644
--- a/libs/ratio/CMakeLists.txt
+++ b/libs/ratio/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_ratio INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_ratio INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/rational/CMakeLists.txt b/libs/rational/CMakeLists.txt
index f9bd2c651..cc69885b1 100644
--- a/libs/rational/CMakeLists.txt
+++ b/libs/rational/CMakeLists.txt
@@ -34,4 +34,4 @@ target_link_libraries(boost_rational INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_rational INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/regex/CMakeLists.txt b/libs/regex/CMakeLists.txt
index 251b50652..66188ba21 100644
--- a/libs/regex/CMakeLists.txt
+++ b/libs/regex/CMakeLists.txt
@@ -62,4 +62,4 @@ target_include_directories(boost_regex PRIVATE include)
 
 bcm_deploy(TARGETS boost_regex INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/scope_exit/CMakeLists.txt b/libs/scope_exit/CMakeLists.txt
index 18b85f11c..331f01333 100644
--- a/libs/scope_exit/CMakeLists.txt
+++ b/libs/scope_exit/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_scope_exit INTERFACE boost::preprocessor)
 
 bcm_deploy(TARGETS boost_scope_exit INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/serialization/CMakeLists.txt b/libs/serialization/CMakeLists.txt
index fc4f97bfc..a92947fe2 100644
--- a/libs/serialization/CMakeLists.txt
+++ b/libs/serialization/CMakeLists.txt
@@ -100,4 +100,4 @@ target_include_directories(boost_serialization PRIVATE include)
 
 bcm_deploy(TARGETS boost_serialization INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/signals/CMakeLists.txt b/libs/signals/CMakeLists.txt
index 30c0eb5a5..0ff5a7094 100644
--- a/libs/signals/CMakeLists.txt
+++ b/libs/signals/CMakeLists.txt
@@ -44,4 +44,4 @@ target_include_directories(boost_signals PRIVATE include)
 
 bcm_deploy(TARGETS boost_signals INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/signals2/CMakeLists.txt b/libs/signals2/CMakeLists.txt
index c8a58f7b8..be6d6e87b 100644
--- a/libs/signals2/CMakeLists.txt
+++ b/libs/signals2/CMakeLists.txt
@@ -52,4 +52,4 @@ target_link_libraries(boost_signals2 INTERFACE boost::smart_ptr)
 
 bcm_deploy(TARGETS boost_signals2 INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/smart_ptr/CMakeLists.txt b/libs/smart_ptr/CMakeLists.txt
index 6d18df659..79ea749b8 100644
--- a/libs/smart_ptr/CMakeLists.txt
+++ b/libs/smart_ptr/CMakeLists.txt
@@ -34,4 +34,4 @@ target_link_libraries(boost_smart_ptr INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_smart_ptr INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/sort/CMakeLists.txt b/libs/sort/CMakeLists.txt
index c810741a0..8f5d38615 100644
--- a/libs/sort/CMakeLists.txt
+++ b/libs/sort/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_sort INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_sort INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/spirit/CMakeLists.txt b/libs/spirit/CMakeLists.txt
index 5ed138383..4f6180b59 100644
--- a/libs/spirit/CMakeLists.txt
+++ b/libs/spirit/CMakeLists.txt
@@ -96,4 +96,4 @@ target_link_libraries(boost_spirit INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_spirit INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/stacktrace/CMakeLists.txt b/libs/stacktrace/CMakeLists.txt
index eb46e32cf..418e5fdf4 100644
--- a/libs/stacktrace/CMakeLists.txt
+++ b/libs/stacktrace/CMakeLists.txt
@@ -18,4 +18,4 @@ set_property(TARGET boost_stacktrace PROPERTY EXPORT_NAME stacktrace)
 
 bcm_deploy(TARGETS boost_stacktrace INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/statechart/CMakeLists.txt b/libs/statechart/CMakeLists.txt
index 75ef377cc..b7142e78d 100644
--- a/libs/statechart/CMakeLists.txt
+++ b/libs/statechart/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(boost_statechart INTERFACE boost::conversion)
 
 bcm_deploy(TARGETS boost_statechart INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/static_assert/CMakeLists.txt b/libs/static_assert/CMakeLists.txt
index 05a2115d4..3d730f1cf 100644
--- a/libs/static_assert/CMakeLists.txt
+++ b/libs/static_assert/CMakeLists.txt
@@ -20,4 +20,4 @@ target_link_libraries(boost_static_assert INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_static_assert INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/system/CMakeLists.txt b/libs/system/CMakeLists.txt
index 70b76fe1a..40e2eb08f 100644
--- a/libs/system/CMakeLists.txt
+++ b/libs/system/CMakeLists.txt
@@ -28,4 +28,4 @@ target_include_directories(boost_system PRIVATE include)
 
 bcm_deploy(TARGETS boost_system INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/test/CMakeLists.txt b/libs/test/CMakeLists.txt
index 61c41fdeb..7822391e1 100644
--- a/libs/test/CMakeLists.txt
+++ b/libs/test/CMakeLists.txt
@@ -126,4 +126,4 @@ bcm_shadow_notify(boost::test)
 
 bcm_deploy(TARGETS boost_prg_exec_monitor boost_test_exec_monitor boost_unit_test_framework INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/thread/CMakeLists.txt b/libs/thread/CMakeLists.txt
index be8a55aac..5d9afe55b 100644
--- a/libs/thread/CMakeLists.txt
+++ b/libs/thread/CMakeLists.txt
@@ -94,4 +94,4 @@ target_include_directories(boost_thread PRIVATE include)
 
 bcm_deploy(TARGETS boost_thread INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/throw_exception/CMakeLists.txt b/libs/throw_exception/CMakeLists.txt
index 4aab6f67f..27e2bdc81 100644
--- a/libs/throw_exception/CMakeLists.txt
+++ b/libs/throw_exception/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_throw_exception INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_throw_exception INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/timer/CMakeLists.txt b/libs/timer/CMakeLists.txt
index dbfd77548..4e71d8197 100644
--- a/libs/timer/CMakeLists.txt
+++ b/libs/timer/CMakeLists.txt
@@ -33,4 +33,4 @@ target_include_directories(boost_timer PRIVATE include)
 
 bcm_deploy(TARGETS boost_timer INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/tokenizer/CMakeLists.txt b/libs/tokenizer/CMakeLists.txt
index a5c613943..d65fe0abb 100644
--- a/libs/tokenizer/CMakeLists.txt
+++ b/libs/tokenizer/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_tokenizer INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_tokenizer INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/tr1/CMakeLists.txt b/libs/tr1/CMakeLists.txt
index cef64e1ff..3432533e0 100644
--- a/libs/tr1/CMakeLists.txt
+++ b/libs/tr1/CMakeLists.txt
@@ -56,4 +56,4 @@ target_link_libraries(boost_tr1 INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_tr1 INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/tti/CMakeLists.txt b/libs/tti/CMakeLists.txt
index 194cac630..d0e2eaa32 100644
--- a/libs/tti/CMakeLists.txt
+++ b/libs/tti/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_tti INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_tti INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/tuple/CMakeLists.txt b/libs/tuple/CMakeLists.txt
index 18ac1b422..673ad13f0 100644
--- a/libs/tuple/CMakeLists.txt
+++ b/libs/tuple/CMakeLists.txt
@@ -26,4 +26,4 @@ target_link_libraries(boost_tuple INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_tuple INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/type_erasure/CMakeLists.txt b/libs/type_erasure/CMakeLists.txt
index 19e3aedd0..6f8863316 100644
--- a/libs/type_erasure/CMakeLists.txt
+++ b/libs/type_erasure/CMakeLists.txt
@@ -44,4 +44,4 @@ target_include_directories(boost_type_erasure PRIVATE include)
 
 bcm_deploy(TARGETS boost_type_erasure INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/type_index/CMakeLists.txt b/libs/type_index/CMakeLists.txt
index 48a3d6720..5be936d05 100644
--- a/libs/type_index/CMakeLists.txt
+++ b/libs/type_index/CMakeLists.txt
@@ -34,4 +34,4 @@ target_link_libraries(boost_type_index INTERFACE boost::preprocessor)
 
 bcm_deploy(TARGETS boost_type_index INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/type_traits/CMakeLists.txt b/libs/type_traits/CMakeLists.txt
index d24a2dd41..ae0242c2c 100644
--- a/libs/type_traits/CMakeLists.txt
+++ b/libs/type_traits/CMakeLists.txt
@@ -24,4 +24,4 @@ target_link_libraries(boost_type_traits INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_type_traits INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/typeof/CMakeLists.txt b/libs/typeof/CMakeLists.txt
index 07b3b75b0..c28c5f39e 100644
--- a/libs/typeof/CMakeLists.txt
+++ b/libs/typeof/CMakeLists.txt
@@ -28,4 +28,4 @@ target_link_libraries(boost_typeof INTERFACE boost::config)
 
 bcm_deploy(TARGETS boost_typeof INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/units/CMakeLists.txt b/libs/units/CMakeLists.txt
index 249390e17..7adbbef58 100644
--- a/libs/units/CMakeLists.txt
+++ b/libs/units/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(boost_units INTERFACE boost::lambda)
 
 bcm_deploy(TARGETS boost_units INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/unordered/CMakeLists.txt b/libs/unordered/CMakeLists.txt
index e8b8c7a28..788b6605d 100644
--- a/libs/unordered/CMakeLists.txt
+++ b/libs/unordered/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(boost_unordered INTERFACE boost::smart_ptr)
 
 bcm_deploy(TARGETS boost_unordered INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/utility/CMakeLists.txt b/libs/utility/CMakeLists.txt
index fb25a0bd5..d30882ba0 100644
--- a/libs/utility/CMakeLists.txt
+++ b/libs/utility/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(boost_utility INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_utility INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/uuid/CMakeLists.txt b/libs/uuid/CMakeLists.txt
index cd418e57c..f2d87703e 100644
--- a/libs/uuid/CMakeLists.txt
+++ b/libs/uuid/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(boost_uuid INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_uuid INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/variant/CMakeLists.txt b/libs/variant/CMakeLists.txt
index 4337afef9..6b5374f75 100644
--- a/libs/variant/CMakeLists.txt
+++ b/libs/variant/CMakeLists.txt
@@ -48,4 +48,4 @@ target_link_libraries(boost_variant INTERFACE boost::utility)
 
 bcm_deploy(TARGETS boost_variant INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/vmd/CMakeLists.txt b/libs/vmd/CMakeLists.txt
index 449dc2dcb..fb4f13e34 100644
--- a/libs/vmd/CMakeLists.txt
+++ b/libs/vmd/CMakeLists.txt
@@ -20,4 +20,4 @@ target_link_libraries(boost_vmd INTERFACE boost::preprocessor)
 
 bcm_deploy(TARGETS boost_vmd INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/wave/CMakeLists.txt b/libs/wave/CMakeLists.txt
index c761e91c8..f4d657170 100644
--- a/libs/wave/CMakeLists.txt
+++ b/libs/wave/CMakeLists.txt
@@ -60,4 +60,4 @@ target_include_directories(boost_wave PRIVATE include)
 
 bcm_deploy(TARGETS boost_wave INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/winapi/CMakeLists.txt b/libs/winapi/CMakeLists.txt
index 86e1aa16a..bdf47950a 100644
--- a/libs/winapi/CMakeLists.txt
+++ b/libs/winapi/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(boost_winapi INTERFACE boost::predef)
 
 bcm_deploy(TARGETS boost_winapi INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()
diff --git a/libs/xpressive/CMakeLists.txt b/libs/xpressive/CMakeLists.txt
index 3b65d54a0..ccd9f15d8 100644
--- a/libs/xpressive/CMakeLists.txt
+++ b/libs/xpressive/CMakeLists.txt
@@ -60,4 +60,4 @@ target_link_libraries(boost_xpressive INTERFACE boost::throw_exception)
 
 bcm_deploy(TARGETS boost_xpressive INCLUDE include NAMESPACE boost::)
 
-add_subdirectory(test)
+bcm_add_test_subdirectory()