diff --git a/swap/test/Jamfile.v2 b/test/swap/Jamfile.v2
similarity index 100%
rename from swap/test/Jamfile.v2
rename to test/swap/Jamfile.v2
diff --git a/swap/test/array_of_array_of_class.cpp b/test/swap/array_of_array_of_class.cpp
similarity index 100%
rename from swap/test/array_of_array_of_class.cpp
rename to test/swap/array_of_array_of_class.cpp
diff --git a/swap/test/array_of_array_of_int.cpp b/test/swap/array_of_array_of_int.cpp
similarity index 100%
rename from swap/test/array_of_array_of_int.cpp
rename to test/swap/array_of_array_of_int.cpp
diff --git a/swap/test/array_of_class.cpp b/test/swap/array_of_class.cpp
similarity index 100%
rename from swap/test/array_of_class.cpp
rename to test/swap/array_of_class.cpp
diff --git a/swap/test/array_of_int.cpp b/test/swap/array_of_int.cpp
similarity index 100%
rename from swap/test/array_of_int.cpp
rename to test/swap/array_of_int.cpp
diff --git a/swap/test/array_of_template.cpp b/test/swap/array_of_template.cpp
similarity index 100%
rename from swap/test/array_of_template.cpp
rename to test/swap/array_of_template.cpp
diff --git a/swap/test/lib_header_1.cpp b/test/swap/lib_header_1.cpp
similarity index 100%
rename from swap/test/lib_header_1.cpp
rename to test/swap/lib_header_1.cpp
diff --git a/swap/test/lib_header_2.cpp b/test/swap/lib_header_2.cpp
similarity index 100%
rename from swap/test/lib_header_2.cpp
rename to test/swap/lib_header_2.cpp
diff --git a/swap/test/mixed_headers_1.cpp b/test/swap/mixed_headers_1.cpp
similarity index 100%
rename from swap/test/mixed_headers_1.cpp
rename to test/swap/mixed_headers_1.cpp
diff --git a/swap/test/mixed_headers_2.cpp b/test/swap/mixed_headers_2.cpp
similarity index 100%
rename from swap/test/mixed_headers_2.cpp
rename to test/swap/mixed_headers_2.cpp
diff --git a/swap/test/no_ambiguity_in_boost.cpp b/test/swap/no_ambiguity_in_boost.cpp
similarity index 100%
rename from swap/test/no_ambiguity_in_boost.cpp
rename to test/swap/no_ambiguity_in_boost.cpp
diff --git a/swap/test/primitive.cpp b/test/swap/primitive.cpp
similarity index 100%
rename from swap/test/primitive.cpp
rename to test/swap/primitive.cpp
diff --git a/swap/test/root_header_1.cpp b/test/swap/root_header_1.cpp
similarity index 100%
rename from swap/test/root_header_1.cpp
rename to test/swap/root_header_1.cpp
diff --git a/swap/test/root_header_2.cpp b/test/swap/root_header_2.cpp
similarity index 100%
rename from swap/test/root_header_2.cpp
rename to test/swap/root_header_2.cpp
diff --git a/swap/test/specialized_in_boost.cpp b/test/swap/specialized_in_boost.cpp
similarity index 100%
rename from swap/test/specialized_in_boost.cpp
rename to test/swap/specialized_in_boost.cpp
diff --git a/swap/test/specialized_in_boost_and_other.cpp b/test/swap/specialized_in_boost_and_other.cpp
similarity index 100%
rename from swap/test/specialized_in_boost_and_other.cpp
rename to test/swap/specialized_in_boost_and_other.cpp
diff --git a/swap/test/specialized_in_global.cpp b/test/swap/specialized_in_global.cpp
similarity index 100%
rename from swap/test/specialized_in_global.cpp
rename to test/swap/specialized_in_global.cpp
diff --git a/swap/test/specialized_in_other.cpp b/test/swap/specialized_in_other.cpp
similarity index 100%
rename from swap/test/specialized_in_other.cpp
rename to test/swap/specialized_in_other.cpp
diff --git a/swap/test/specialized_in_std.cpp b/test/swap/specialized_in_std.cpp
similarity index 100%
rename from swap/test/specialized_in_std.cpp
rename to test/swap/specialized_in_std.cpp
diff --git a/swap/test/std_bitset.cpp b/test/swap/std_bitset.cpp
similarity index 100%
rename from swap/test/std_bitset.cpp
rename to test/swap/std_bitset.cpp
diff --git a/swap/test/std_dateorder.cpp b/test/swap/std_dateorder.cpp
similarity index 100%
rename from swap/test/std_dateorder.cpp
rename to test/swap/std_dateorder.cpp
diff --git a/swap/test/std_string.cpp b/test/swap/std_string.cpp
similarity index 100%
rename from swap/test/std_string.cpp
rename to test/swap/std_string.cpp
diff --git a/swap/test/std_typeinfo_ptr.cpp b/test/swap/std_typeinfo_ptr.cpp
similarity index 100%
rename from swap/test/std_typeinfo_ptr.cpp
rename to test/swap/std_typeinfo_ptr.cpp
diff --git a/swap/test/std_vector_of_boost.cpp b/test/swap/std_vector_of_boost.cpp
similarity index 100%
rename from swap/test/std_vector_of_boost.cpp
rename to test/swap/std_vector_of_boost.cpp
diff --git a/swap/test/std_vector_of_global.cpp b/test/swap/std_vector_of_global.cpp
similarity index 100%
rename from swap/test/std_vector_of_global.cpp
rename to test/swap/std_vector_of_global.cpp
diff --git a/swap/test/std_vector_of_other.cpp b/test/swap/std_vector_of_other.cpp
similarity index 100%
rename from swap/test/std_vector_of_other.cpp
rename to test/swap/std_vector_of_other.cpp
diff --git a/swap/test/swap_test_class.hpp b/test/swap/swap_test_class.hpp
similarity index 100%
rename from swap/test/swap_test_class.hpp
rename to test/swap/swap_test_class.hpp