diff --git a/CMakeLists.txt b/CMakeLists.txt
index df4998a..ea7c9d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ set (lib_headers
 boost_library_project(
   utility
   #  SRCDIRS 
-  TESTDIRS  test swap/test
+  TESTDIRS  test swap/test enable_if/test
   HEADERS ${lib_headers}
   #  DOCDIRS 
   DESCRIPTION  "Various small utilities for C++ programming."
diff --git a/enable_if/test/CMakeLists.txt b/enable_if/test/CMakeLists.txt
new file mode 100644
index 0000000..a6e1a4f
--- /dev/null
+++ b/enable_if/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+foreach(T
+    constructors
+    dummy_arg_disambiguation
+    lazy
+    lazy_test
+    member_templates
+    namespace_disambiguation
+    no_disambiguation
+    partial_specializations
+    )
+  boost_test_run(${T} DEPENDS boost_test_exec_monitor)
+endforeach()
+
+
diff --git a/swap/test/CMakeLists.txt b/swap/test/CMakeLists.txt
new file mode 100644
index 0000000..1570d83
--- /dev/null
+++ b/swap/test/CMakeLists.txt
@@ -0,0 +1,35 @@
+
+foreach(T 
+    root_header_1 root_header_2 
+    lib_header_1 lib_header_2 
+    mixed_headers_1 mixed_headers_2)
+  boost_test_compile(${T})
+endforeach() 
+
+
+#     [ run primitive.cpp ../../../test/build//boost_test_exec_monitor/<link>static                      ]
+
+
+foreach(T
+    primitive
+    specialized_in_boost
+    specialized_in_global
+    specialized_in_other
+    specialized_in_std
+    specialized_in_boost_and_other
+    std_bitset
+    std_dateorder
+    std_string
+    std_typeinfo_ptr
+    std_vector_of_boost
+    std_vector_of_global
+    std_vector_of_other
+    no_ambiguity_in_boost
+    array_of_array_of_class
+    array_of_array_of_int
+    array_of_class
+    array_of_int
+    array_of_template)
+  boost_test_run(${T} DEPENDS boost_test_exec_monitor)
+endforeach()
+