diff --git a/enable_if/test/Jamfile.v2 b/enable_if/test/Jamfile.v2
deleted file mode 100644
index 77a8798..0000000
--- a/enable_if/test/Jamfile.v2
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/
-
-project
-    : requirements <library>/boost/test//boost_test_exec_monitor
-    ;
-
-test-suite utility/enable_if
-        :
-        [ run constructors.cpp ]
-        [ run dummy_arg_disambiguation.cpp ]
-        [ run lazy.cpp ]
-        [ run lazy_test.cpp ]
-        [ run member_templates.cpp ]
-        [ run namespace_disambiguation.cpp ]
-        [ run no_disambiguation.cpp ]
-        [ run partial_specializations.cpp ]
-    ;
-
diff --git a/addressof_fn_test.cpp b/test/addressof_fn_test.cpp
similarity index 100%
rename from addressof_fn_test.cpp
rename to test/addressof_fn_test.cpp
diff --git a/addressof_np_test.cpp b/test/addressof_np_test.cpp
similarity index 100%
rename from addressof_np_test.cpp
rename to test/addressof_np_test.cpp
diff --git a/addressof_test.cpp b/test/addressof_test.cpp
similarity index 100%
rename from addressof_test.cpp
rename to test/addressof_test.cpp
diff --git a/addressof_test2.cpp b/test/addressof_test2.cpp
similarity index 100%
rename from addressof_test2.cpp
rename to test/addressof_test2.cpp
diff --git a/checked_delete_test.cpp b/test/checked_delete_test.cpp
similarity index 100%
rename from checked_delete_test.cpp
rename to test/checked_delete_test.cpp
diff --git a/enable_if/test/constructors.cpp b/test/eif_constructors.cpp
similarity index 100%
rename from enable_if/test/constructors.cpp
rename to test/eif_constructors.cpp
diff --git a/enable_if/test/dummy_arg_disambiguation.cpp b/test/eif_dummy_arg_disambiguation.cpp
similarity index 100%
rename from enable_if/test/dummy_arg_disambiguation.cpp
rename to test/eif_dummy_arg_disambiguation.cpp
diff --git a/enable_if/test/lazy.cpp b/test/eif_lazy.cpp
similarity index 100%
rename from enable_if/test/lazy.cpp
rename to test/eif_lazy.cpp
diff --git a/enable_if/test/lazy_test.cpp b/test/eif_lazy_test.cpp
similarity index 100%
rename from enable_if/test/lazy_test.cpp
rename to test/eif_lazy_test.cpp
diff --git a/enable_if/test/member_templates.cpp b/test/eif_member_templates.cpp
similarity index 100%
rename from enable_if/test/member_templates.cpp
rename to test/eif_member_templates.cpp
diff --git a/enable_if/test/namespace_disambiguation.cpp b/test/eif_namespace_disambiguation.cpp
similarity index 100%
rename from enable_if/test/namespace_disambiguation.cpp
rename to test/eif_namespace_disambiguation.cpp
diff --git a/enable_if/test/no_disambiguation.cpp b/test/eif_no_disambiguation.cpp
similarity index 100%
rename from enable_if/test/no_disambiguation.cpp
rename to test/eif_no_disambiguation.cpp
diff --git a/enable_if/test/partial_specializations.cpp b/test/eif_partial_specializations.cpp
similarity index 100%
rename from enable_if/test/partial_specializations.cpp
rename to test/eif_partial_specializations.cpp
diff --git a/ref_ct_test.cpp b/test/ref_ct_test.cpp
similarity index 100%
rename from ref_ct_test.cpp
rename to test/ref_ct_test.cpp
diff --git a/ref_test.cpp b/test/ref_test.cpp
similarity index 100%
rename from ref_test.cpp
rename to test/ref_test.cpp