diff --git a/test/Jamfile b/test/Jamfile
index 5d2089d..07a50dd 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -7,27 +7,25 @@
 #  accompanying file LICENSE_1_0.txt or copy at
 #  http://www.boost.org/LICENSE_1_0.txt)
 
-# bring in rules for testing
 import testing ;
 
+project
+    : requirements
+      <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)
+    ;
+
 # quick test (for CI)
 run quick.cpp ;
 
 # full test suite
 run smart_ptr_test.cpp ;
-run shared_ptr_basic_test.cpp
-    : : : <toolset>gcc:<cxxflags>-Wno-non-virtual-dtor ;
-
-run shared_ptr_test.cpp
-    : : :
-    <toolset>gcc:<cxxflags>-Wno-non-virtual-dtor
-    <toolset>gcc:<cxxflags>-Wno-deprecated-declarations ;
-
+run shared_ptr_basic_test.cpp ;
+run shared_ptr_test.cpp ;
 run weak_ptr_test.cpp ;
 run weak_ptr_move_test.cpp ;
-run shared_from_this_test.cpp
-    : : : <toolset>gcc:<cxxflags>-Wno-non-virtual-dtor ;
-
+run shared_from_this_test.cpp ;
 run get_deleter_test.cpp ;
 run intrusive_ptr_test.cpp ;
 run intrusive_ptr_move_test.cpp ;