diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8eda13c..88cea93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,5 +18,3 @@ boost_library_project(
            "Herve Bronnimann <hbr -at- poly.edu>"
   #  MAINTAINERS 
 )
-
-
diff --git a/minmax/test/CMakeLists.txt b/minmax/test/CMakeLists.txt
index dcd2cb0..4de3f2e 100644
--- a/minmax/test/CMakeLists.txt
+++ b/minmax/test/CMakeLists.txt
@@ -1,8 +1,4 @@
-#-------------------------------------------------------------------------
-#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;test;mpl;bind;type_traits;static_assert;preprocessor;array;iterator;timer;tuple;range")
-#-------------------------------------------------------------------------
-
+boost_additional_test_dependencies(algorithm BOOST_DEPENDS test)
 
 boost_test_run(minmax_element_test)
 boost_test_run(minmax_test)
diff --git a/string/test/CMakeLists.txt b/string/test/CMakeLists.txt
index f69e592..d432866 100644
--- a/string/test/CMakeLists.txt
+++ b/string/test/CMakeLists.txt
@@ -1,11 +1,7 @@
-#-------------------------------------------------------------------------
-#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;test;mpl;bind;type_traits;static_assert;preprocessor;array;iterator;exception;range;timer")
-#-------------------------------------------------------------------------
+boost_additional_test_dependencies(algorithm BOOST_DEPENDS test)
 
 
 boost_test_run(trim_test)
-
 boost_test_run(conv_test)
 boost_test_run(predicate_test)
 boost_test_run(find_test)