diff --git a/enable_if/test/Jamfile b/enable_if/test/Jamfile
new file mode 100644
index 0000000..f2e5ee3
--- /dev/null
+++ b/enable_if/test/Jamfile
@@ -0,0 +1,33 @@
+# Copyright David Abrahams 2003.
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or copy at 
+# http://www.boost.org/LICENSE_1_0.txt)
+
+# For more information, see http://www.boost.org/
+
+subproject libs/utility/enable_if/test ;
+
+# bring in rules for testing
+import testing ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+{
+    local test_monitor = <lib>@boost/libs/test/build/boost_test_exec_monitor ;
+
+    # look in BOOST_ROOT for sources first, just in this Jamfile
+    local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
+
+    test-suite utility/enable_if
+        :
+        [ run libs/utility/enable_if/test/constructors.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/dummy_arg_disambiguation.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/lazy.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/lazy_test.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/member_templates.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/namespace_disambiguation.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/no_disambiguation.cpp $(test_monitor) ]
+        [ run libs/utility/enable_if/test/partial_specializations.cpp $(test_monitor) ]
+    ;
+}
diff --git a/enable_if_constructors.cpp b/enable_if/test/constructors.cpp
similarity index 100%
rename from enable_if_constructors.cpp
rename to enable_if/test/constructors.cpp
diff --git a/enable_if_dummy_arg_disambiguation.cpp b/enable_if/test/dummy_arg_disambiguation.cpp
similarity index 100%
rename from enable_if_dummy_arg_disambiguation.cpp
rename to enable_if/test/dummy_arg_disambiguation.cpp
diff --git a/enable_if_lazy.cpp b/enable_if/test/lazy.cpp
similarity index 100%
rename from enable_if_lazy.cpp
rename to enable_if/test/lazy.cpp
diff --git a/enable_if_lazy_test.cpp b/enable_if/test/lazy_test.cpp
similarity index 100%
rename from enable_if_lazy_test.cpp
rename to enable_if/test/lazy_test.cpp
diff --git a/enable_if_member_templates.cpp b/enable_if/test/member_templates.cpp
similarity index 100%
rename from enable_if_member_templates.cpp
rename to enable_if/test/member_templates.cpp
diff --git a/enable_if_namespace_disambiguation.cpp b/enable_if/test/namespace_disambiguation.cpp
similarity index 100%
rename from enable_if_namespace_disambiguation.cpp
rename to enable_if/test/namespace_disambiguation.cpp
diff --git a/enable_if_no_disambiguation.cpp b/enable_if/test/no_disambiguation.cpp
similarity index 100%
rename from enable_if_no_disambiguation.cpp
rename to enable_if/test/no_disambiguation.cpp
diff --git a/enable_if_partial_specializations.cpp b/enable_if/test/partial_specializations.cpp
similarity index 100%
rename from enable_if_partial_specializations.cpp
rename to enable_if/test/partial_specializations.cpp
diff --git a/test/Jamfile b/test/Jamfile
index 6d23821..5e6a4f5 100755
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -27,14 +27,6 @@ test-suite utility
         [ compile-fail ../checked_delete_test.cpp ]
         [ run ../compressed_pair_test.cpp $(test_monitor) : -u ]
         [ run ../current_function_test.cpp : : : <test-info>always_show_run_output ]
-        [ run ../enable_if_constructors.cpp $(test_monitor) ]
-        [ run ../enable_if_dummy_arg_disambiguation.cpp $(test_monitor) ]
-        [ run ../enable_if_lazy.cpp $(test_monitor) ]
-        [ run ../enable_if_lazy_test.cpp $(test_monitor) ]
-        [ run ../enable_if_member_templates.cpp $(test_monitor) ]
-        [ run ../enable_if_namespace_disambiguation.cpp $(test_monitor) ]
-        [ run ../enable_if_no_disambiguation.cpp $(test_monitor) ]
-        [ run ../enable_if_partial_specializations.cpp $(test_monitor) ]
         [ run ../iterator_traits_test.cpp ]
         [ run ../iterators_test.cpp $(test_monitor) ]
         [ run next_prior_test.cpp $(test_monitor) ]
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 9eb3bad..a4dde30 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -20,14 +20,6 @@ test-suite utility
         [ compile-fail ../checked_delete_test.cpp ]
         [ run ../compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor : -u ]
         [ run ../current_function_test.cpp : : : <test-info>always_show_run_output ]
-        [ run ../enable_if_constructors.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_dummy_arg_disambiguation.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_lazy.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_lazy_test.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_member_templates.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_namespace_disambiguation.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_no_disambiguation.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run ../enable_if_partial_specializations.cpp ../../test/build//boost_test_exec_monitor ]
         [ run ../iterator_traits_test.cpp ]
         [ run ../iterators_test.cpp ../../test/build//boost_test_exec_monitor ]
         [ run next_prior_test.cpp ../../test/build//boost_test_exec_monitor ]