diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f0f16866..0d7bf6d2 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -3,6 +3,5 @@
 # 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)
 
-build-project container ;
 build-project unordered ;
 build-project exception ;
diff --git a/test/container/Jamfile.v2 b/test/container/Jamfile.v2
deleted file mode 100644
index 7d050bd7..00000000
--- a/test/container/Jamfile.v2
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Copyright 2005 Daniel James.
-# 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 ;
-
-project unordered-test/container
-    : requirements
-        <toolset>intel-linux:"<cxxflags>-strict_ansi -cxxlib-icc"
-        <toolset>gcc:<cxxflags>-Wsign-promo
-        <toolset>msvc:<cxxflags>/W4
-    ;
-
-test-suite container-tests
-    :
-        [ run set_compile.cpp ]
-        [ run map_compile.cpp ]
-        [ run simple_tests.cpp ]
-        [ run link_test_1.cpp link_test_2.cpp ]
-    ;
diff --git a/test/unordered/Jamfile.v2 b/test/unordered/Jamfile.v2
index 5390ec46..005a7787 100644
--- a/test/unordered/Jamfile.v2
+++ b/test/unordered/Jamfile.v2
@@ -14,8 +14,12 @@ project unordered-test/unordered
 
 test-suite unordered-tests
     :
-        [ run equivalent_keys_tests.cpp ]
+        [ run set_compile.cpp ]
+        [ run map_compile.cpp ]
+        [ run simple_tests.cpp ]
+        [ run link_test_1.cpp link_test_2.cpp ]
         [ run compile_tests.cpp ]
+        [ run equivalent_keys_tests.cpp ]
         [ run constructor_tests.cpp ]
         [ run copy_tests.cpp ]
         [ run assign_tests.cpp ]
diff --git a/test/container/compile_tests.hpp b/test/unordered/compile_tests.hpp
similarity index 100%
rename from test/container/compile_tests.hpp
rename to test/unordered/compile_tests.hpp
diff --git a/test/container/link_test_1.cpp b/test/unordered/link_test_1.cpp
similarity index 100%
rename from test/container/link_test_1.cpp
rename to test/unordered/link_test_1.cpp
diff --git a/test/container/link_test_2.cpp b/test/unordered/link_test_2.cpp
similarity index 100%
rename from test/container/link_test_2.cpp
rename to test/unordered/link_test_2.cpp
diff --git a/test/container/map_compile.cpp b/test/unordered/map_compile.cpp
similarity index 100%
rename from test/container/map_compile.cpp
rename to test/unordered/map_compile.cpp
diff --git a/test/container/set_compile.cpp b/test/unordered/set_compile.cpp
similarity index 100%
rename from test/container/set_compile.cpp
rename to test/unordered/set_compile.cpp
diff --git a/test/container/simple_tests.cpp b/test/unordered/simple_tests.cpp
similarity index 100%
rename from test/container/simple_tests.cpp
rename to test/unordered/simple_tests.cpp