diff --git a/test/Jamfile b/test/Jamfile
index 1714990..8c21bf7 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -18,14 +18,10 @@ project
       <library>/boost/align//boost_align
       <toolset>gcc:<cxxflags>-Wno-non-virtual-dtor
       <toolset>gcc:<cxxflags>-Wno-deprecated-declarations
-      #<toolset>gcc:<cxxflags>-Wno-delete-non-virtual-dtor (not in 4.4/4.6)
+      <toolset>gcc:<cxxflags>-Wno-delete-non-virtual-dtor
     ;
 
-local cnhash =
-
-  <library>/boost/container_hash//boost_container_hash
-  [ requires cxx11_decltype cxx11_noexcept ]
-  <toolset>gcc-4.6:<build>no ;
+local cnhash = <library>/boost/container_hash//boost_container_hash ;
 
 # quick test (for CI)
 run quick.cpp ;
@@ -68,11 +64,7 @@ run yield_k_test.cpp : : : <threading>multi : yield_k_test.mt ;
 run spinlock_test.cpp ;
 run spinlock_try_test.cpp ;
 run spinlock_try_test.cpp : : : <threading>multi : spinlock_try_test.mt ;
-run spinlock_pool_test.cpp
-  : : :
-  # msvc-8.0, 9.0 optimizer codegen bug for `x % 41`
-  <toolset>msvc-8.0,<variant>release:<build>no
-  <toolset>msvc-9.0,<variant>release:<build>no ;
+run spinlock_pool_test.cpp ;
 
 run make_shared_test.cpp ;
 run make_shared_move_emulation_test.cpp
@@ -98,8 +90,7 @@ run sp_recursive_assign2_test.cpp ;
 run sp_recursive_assign_rv_test.cpp ;
 run sp_recursive_assign2_rv_test.cpp ;
 
-compile-fail auto_ptr_lv_fail.cpp
-  : <toolset>gcc-4.4.7:<build>no <toolset>gcc-4.4:<build>no ;
+compile-fail auto_ptr_lv_fail.cpp ;
 
 run atomic_count_test2.cpp ;
 run sp_typeinfo_test.cpp ;
@@ -182,33 +173,23 @@ compile-fail array_fail_dereference.cpp ;
 compile-fail array_fail_member_access.cpp ;
 compile-fail array_fail_array_access.cpp ;
 
-run make_shared_array_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
+run make_shared_array_test.cpp ;
 run make_shared_arrays_test.cpp ;
-run make_shared_array_throws_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
-run make_shared_array_esft_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
-run make_shared_array_noinit_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
-run make_shared_array_value_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
+run make_shared_array_throws_test.cpp ;
+run make_shared_array_esft_test.cpp ;
+run make_shared_array_noinit_test.cpp ;
+run make_shared_array_value_test.cpp ;
 run allocate_shared_array_test.cpp ;
 run allocate_shared_arrays_test.cpp ;
-run allocate_shared_array_throws_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
-run allocate_shared_array_esft_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
-run allocate_shared_array_noinit_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
-run allocate_shared_array_value_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
+run allocate_shared_array_throws_test.cpp ;
+run allocate_shared_array_esft_test.cpp ;
+run allocate_shared_array_noinit_test.cpp ;
+run allocate_shared_array_value_test.cpp ;
 run allocate_shared_array_construct_test.cpp ;
 
 run make_unique_test.cpp ;
 run make_unique_args_test.cpp ;
-run make_unique_value_test.cpp
-  : : : <toolset>gcc-4.6:<cxxflags>-fno-deduce-init-list ;
+run make_unique_value_test.cpp ;
 run make_unique_noinit_test.cpp ;
 run make_unique_throws_test.cpp ;
 run make_unique_array_test.cpp ;
@@ -273,8 +254,7 @@ run shared_ptr_fn_test.cpp ;
 run get_deleter_test2.cpp ;
 run get_deleter_test3.cpp ;
 run get_deleter_array_test2.cpp ;
-run get_deleter_array_test3.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
+run get_deleter_array_test3.cpp ;
 
 run sp_convertible_test2.cpp ;
 
@@ -296,15 +276,13 @@ run allocate_local_shared_test.cpp ;
 run allocate_local_shared_esft_test.cpp ;
 
 run make_local_shared_array_test.cpp ;
-run make_local_shared_arrays_test.cpp
-  : : : <toolset>gcc-4.6.3_0x:<cxxflags>-fno-deduce-init-list ;
+run make_local_shared_arrays_test.cpp ;
 run make_local_shared_array_throws_test.cpp ;
 run make_local_shared_array_esft_test.cpp ;
 run make_local_shared_array_noinit_test.cpp ;
 run make_local_shared_array_value_test.cpp ;
 run allocate_local_shared_array_test.cpp ;
-run allocate_local_shared_arrays_test.cpp
-  : : : <toolset>gcc-4.6.3_0x:<cxxflags>-fno-deduce-init-list ;
+run allocate_local_shared_arrays_test.cpp ;
 run allocate_local_shared_array_throws_test.cpp ;
 run allocate_local_shared_array_esft_test.cpp ;
 run allocate_local_shared_array_noinit_test.cpp ;
@@ -315,8 +293,7 @@ run local_sp_fn_test.cpp ;
 run lsp_convertible_test.cpp ;
 run lsp_convertible_test2.cpp ;
 
-run make_shared_array_tmp_test.cpp
-  : : : <toolset>msvc-8.0:<build>no ;
+run make_shared_array_tmp_test.cpp ;
 
 run lw_thread_test.cpp
   : : : <threading>multi ;
@@ -354,9 +331,9 @@ run weak_ptr_alias_move_test.cpp ;
 
 run sp_typeinfo_test.cpp : : : <rtti>off : sp_typeinfo_test_no_rtti ;
 
-run get_deleter_test.cpp  : : : <rtti>off <toolset>gcc-4.4.7,<cxxstd>0x:<build>no <toolset>gcc-4.4,<cxxstd>0x:<build>no : get_deleter_test_no_rtti ;
-run get_deleter_test2.cpp : : : <rtti>off <toolset>gcc-4.4.7,<cxxstd>0x:<build>no <toolset>gcc-4.4,<cxxstd>0x:<build>no : get_deleter_test2_no_rtti ;
-run get_deleter_test3.cpp : : : <rtti>off <toolset>gcc-4.4.7,<cxxstd>0x:<build>no <toolset>gcc-4.4,<cxxstd>0x:<build>no : get_deleter_test3_no_rtti ;
+run get_deleter_test.cpp  : : : <rtti>off : get_deleter_test_no_rtti ;
+run get_deleter_test2.cpp : : : <rtti>off : get_deleter_test2_no_rtti ;
+run get_deleter_test3.cpp : : : <rtti>off : get_deleter_test3_no_rtti ;
 
 run shared_from_test.cpp ;
 run weak_from_test.cpp ;
@@ -415,12 +392,7 @@ run lsp_hash_test.cpp
   : : : $(cnhash)  ;
 run lsp_hash_test2.cpp ;
 
-local MT =
-
-  <threading>multi
-  <library>/boost/bind//boost_bind
-  [ requires cxx11_decltype cxx11_noexcept ]
-  <toolset>gcc-4.6:<build>no ;
+local MT = <threading>multi <library>/boost/bind//boost_bind ;
 
 run atomic_count_mt_test.cpp
   : : : $(MT) ;