diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 185fb39e..003b6d0c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -77,11 +77,6 @@ fca_tests(SOURCES exception/swap_exception_tests.cpp COMPILE_DEFINITIONS BOOST_U
 fca_tests(SOURCES exception/merge_exception_tests.cpp)
 fca_tests(SOURCES exception/less_tests.cpp)
 fca_tests(SOURCES unordered/narrow_cast_tests.cpp)
-fca_tests(SOURCES unordered/compile_set.cpp COMPILE_DEFINITIONS BOOST_UNORDERED_USE_MOVE NAME bmove_compile_set)
-fca_tests(SOURCES unordered/compile_map.cpp COMPILE_DEFINITIONS BOOST_UNORDERED_USE_MOVE NAME bmove_compile_map)
-fca_tests(SOURCES unordered/copy_tests.cpp COMPILE_DEFINITIONS BOOST_UNORDERED_USE_MOVE NAME bmove_copy)
-fca_tests(SOURCES unordered/move_tests.cpp COMPILE_DEFINITIONS BOOST_UNORDERED_USE_MOVE NAME bmove_move)
-fca_tests(SOURCES unordered/assign_tests.cpp COMPILE_DEFINITIONS BOOST_UNORDERED_USE_MOVE NAME bmove_assign)
 fca_tests(SOURCES quick.cpp)
 
 fca_tests(TYPE compile-fail NAME insert_node_type_fail_map COMPILE_DEFINITIONS UNORDERED_TEST_MAP SOURCES unordered/insert_node_type_fail.cpp)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 93a28ca6..b72876e8 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -146,12 +146,6 @@ for local test in $(FCA_TESTS)
 
 run unordered/link_test_1.cpp unordered/link_test_2.cpp : : : : link_test ;
 
-run unordered/compile_set.cpp  : : : <define>BOOST_UNORDERED_USE_MOVE : bmove_compile_set ;
-run unordered/compile_map.cpp  : : : <define>BOOST_UNORDERED_USE_MOVE : bmove_compile_map ;
-run unordered/copy_tests.cpp   : : : <define>BOOST_UNORDERED_USE_MOVE : bmove_copy ;
-run unordered/move_tests.cpp   : : : <define>BOOST_UNORDERED_USE_MOVE : bmove_move ;
-run unordered/assign_tests.cpp : : : <define>BOOST_UNORDERED_USE_MOVE : bmove_assign ;
-
 run unordered/serialization_tests.cpp
     : $(BOOST_UNORDERED_TEST_DIR)
     :
@@ -198,11 +192,6 @@ alias fca_tests :
   $(FCA_TESTS)
   $(FCA_EXCEPTION_TESTS)
   link_test
-  bmove_compile_set
-  bmove_compile_map
-  bmove_copy
-  bmove_move
-  bmove_assign
   insert_node_type_fail_map
   insert_node_type_fail_multimap
   insert_node_type_fail_set