diff --git a/include/boost/mpl/aux_/test.hpp b/core/include/boost/mpl/aux_/test.hpp
similarity index 100%
rename from include/boost/mpl/aux_/test.hpp
rename to core/include/boost/mpl/aux_/test.hpp
diff --git a/include/boost/mpl/aux_/test/assert.hpp b/core/include/boost/mpl/aux_/test/assert.hpp
similarity index 100%
rename from include/boost/mpl/aux_/test/assert.hpp
rename to core/include/boost/mpl/aux_/test/assert.hpp
diff --git a/include/boost/mpl/aux_/test/data.hpp b/core/include/boost/mpl/aux_/test/data.hpp
similarity index 100%
rename from include/boost/mpl/aux_/test/data.hpp
rename to core/include/boost/mpl/aux_/test/data.hpp
diff --git a/include/boost/mpl/aux_/test/test_case.hpp b/core/include/boost/mpl/aux_/test/test_case.hpp
similarity index 100%
rename from include/boost/mpl/aux_/test/test_case.hpp
rename to core/include/boost/mpl/aux_/test/test_case.hpp
diff --git a/core/test/Jamfile.v2 b/core/test/Jamfile.v2
new file mode 100644
index 0000000..677d90b
--- /dev/null
+++ b/core/test/Jamfile.v2
@@ -0,0 +1,32 @@
+#  Boost.MPL.Core Library test Jamfile
+#
+#  Copyright (c) 2005 Vladimir Prus
+#  Copyright (c) 2006-2007 Dave Abrahams
+#  Copyright (c) 2009 Eric Niebler
+#  Copyright (c) 2009 Steven Watanabe
+#
+#  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
+
+import testing ;
+
+compile aux_/largest_int.cpp ;
+
+compile arithmetic.cpp ;
+compile assert.cpp ;
+compile bitwise.cpp ;
+run bool.cpp ;
+compile comparison.cpp ;
+compile eval_if.cpp ;
+compile has_xxx.cpp ;
+compile identity.cpp ;
+compile if.cpp ;
+run int.cpp ;
+run char.cpp ;
+run integral_c.cpp : : : <toolset>vacpp:<cxxflags>-qchars=signed ;
+compile logical.cpp ;
+compile no_has_xxx.cpp ;
+compile numeric_ops.cpp ;
+run print.cpp ;
+run size_t.cpp ;
diff --git a/test/arithmetic.cpp b/core/test/arithmetic.cpp
similarity index 100%
rename from test/arithmetic.cpp
rename to core/test/arithmetic.cpp
diff --git a/test/assert.cpp b/core/test/assert.cpp
similarity index 100%
rename from test/assert.cpp
rename to core/test/assert.cpp
diff --git a/test/aux_/largest_int.cpp b/core/test/aux_/largest_int.cpp
similarity index 100%
rename from test/aux_/largest_int.cpp
rename to core/test/aux_/largest_int.cpp
diff --git a/test/bitwise.cpp b/core/test/bitwise.cpp
similarity index 100%
rename from test/bitwise.cpp
rename to core/test/bitwise.cpp
diff --git a/test/bool.cpp b/core/test/bool.cpp
similarity index 100%
rename from test/bool.cpp
rename to core/test/bool.cpp
diff --git a/test/char.cpp b/core/test/char.cpp
similarity index 100%
rename from test/char.cpp
rename to core/test/char.cpp
diff --git a/test/comparison.cpp b/core/test/comparison.cpp
similarity index 100%
rename from test/comparison.cpp
rename to core/test/comparison.cpp
diff --git a/test/eval_if.cpp b/core/test/eval_if.cpp
similarity index 100%
rename from test/eval_if.cpp
rename to core/test/eval_if.cpp
diff --git a/test/has_xxx.cpp b/core/test/has_xxx.cpp
similarity index 100%
rename from test/has_xxx.cpp
rename to core/test/has_xxx.cpp
diff --git a/test/identity.cpp b/core/test/identity.cpp
similarity index 100%
rename from test/identity.cpp
rename to core/test/identity.cpp
diff --git a/test/if.cpp b/core/test/if.cpp
similarity index 100%
rename from test/if.cpp
rename to core/test/if.cpp
diff --git a/test/int.cpp b/core/test/int.cpp
similarity index 100%
rename from test/int.cpp
rename to core/test/int.cpp
diff --git a/test/integral_c.cpp b/core/test/integral_c.cpp
similarity index 100%
rename from test/integral_c.cpp
rename to core/test/integral_c.cpp
diff --git a/test/integral_wrapper_test.hpp b/core/test/integral_wrapper_test.hpp
similarity index 100%
rename from test/integral_wrapper_test.hpp
rename to core/test/integral_wrapper_test.hpp
diff --git a/test/logical.cpp b/core/test/logical.cpp
similarity index 100%
rename from test/logical.cpp
rename to core/test/logical.cpp
diff --git a/test/no_has_xxx.cpp b/core/test/no_has_xxx.cpp
similarity index 100%
rename from test/no_has_xxx.cpp
rename to core/test/no_has_xxx.cpp
diff --git a/test/numeric_ops.cpp b/core/test/numeric_ops.cpp
similarity index 100%
rename from test/numeric_ops.cpp
rename to core/test/numeric_ops.cpp
diff --git a/test/print.cpp b/core/test/print.cpp
similarity index 100%
rename from test/print.cpp
rename to core/test/print.cpp
diff --git a/test/size_t.cpp b/core/test/size_t.cpp
similarity index 100%
rename from test/size_t.cpp
rename to core/test/size_t.cpp
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0031a52..d8d8b1d 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,5 +1,16 @@
+#  Boost.MPL Library test Jamfile
+#
+#  Copyright (c) 2005 Vladimir Prus
+#  Copyright (c) 2006-2007 Dave Abrahams
+#  Copyright (c) 2009 Eric Niebler
+#  Copyright (c) 2009 Steven Watanabe
+#
+#  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
+
+import testing ;
 
-compile aux_/largest_int.cpp ;
 compile aux_/msvc_is_class.cpp ;
 compile aux_/template_arity.cpp ;
 compile aux_/preprocessor/is_seq.cpp ;
@@ -9,15 +20,10 @@ compile advance.cpp ;
 compile always.cpp ;
 compile apply.cpp ;
 compile apply_wrap.cpp ;
-compile arithmetic.cpp ;
 compile as_sequence.cpp ;
-compile assert.cpp ;
 compile at.cpp ;
 compile back.cpp ;
 compile bind.cpp ;
-compile bitwise.cpp ;
-run bool.cpp ;
-compile comparison.cpp ;
 compile contains.cpp ;
 compile copy.cpp ;
 compile copy_if.cpp ;
@@ -29,23 +35,16 @@ compile empty.cpp ;
 compile equal.cpp ;
 compile erase.cpp ;
 compile erase_range.cpp ;
-compile eval_if.cpp ;
 compile filter_view.cpp ;
 compile find.cpp ;
 compile find_if.cpp ;
 compile fold.cpp ;
 run for_each.cpp ;
 compile front.cpp ;
-compile has_xxx.cpp ;
-compile identity.cpp ;
-compile if.cpp ;
 compile index_of.cpp ;
 compile inherit.cpp ;
 compile insert.cpp ;
 compile insert_range.cpp ;
-run int.cpp ;
-run char.cpp ;
-run integral_c.cpp : : : <toolset>vacpp:<cxxflags>-qchars=signed ;
 compile is_placeholder.cpp ;
 compile is_sequence.cpp ;
 compile iterator_tags.cpp ;
@@ -54,15 +53,12 @@ compile lambda.cpp ;
 compile lambda_args.cpp ;
 compile list.cpp ;
 compile list_c.cpp ;
-compile logical.cpp ;
 compile lower_bound.cpp ;
 compile map.cpp ;
 compile max_element.cpp ;
 compile min_max.cpp ;
 compile multiset.cpp ;
 compile next.cpp ;
-compile no_has_xxx.cpp ;
-compile numeric_ops.cpp ;
 compile pair_view.cpp ;
 compile partition.cpp ;
 compile pop_front.cpp ;
@@ -80,7 +76,6 @@ compile set.cpp ;
 compile set_c.cpp ;
 compile single_view.cpp ;
 compile size.cpp ;
-run size_t.cpp ;
 compile sizeof.cpp ;
 compile sort.cpp ;
 compile stable_partition.cpp ;