diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 6fffb25..5e13609 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,86 +1,20 @@
 
 # bring in the rules for testing
 import testing ;
-    			
-rule type-traits-run ( sources + )
-{
-        return [ 
-           run
-             # sources
-             $(sources)
 
-             # dependencies
-             type_traits_init 
-             ../../test/build//boost_unit_test_framework 
-         :  # additional args
-            --report_level=detailed --build_info=yes --log_level=messages
-         :  # test-files
-         :  # requirements
-         :  # test name
-        ] ;
+# type_traits in V1 seem to have two modes: standalone, triggered
+# by a command line option, and a regular. For now, just imitate
+# regular               
+
+rule all-tests {
+     local result ;
+     for local source in [ glob *_test.cpp ] udt_specialisations.cpp
+     {
+         result += [ run $(source) ] ;
+     }
+     return $(result) ;     
 }
-
-lib type_traits_init : init.cpp 
-    	: 
-    	: 
-;
-    
-        
-test-suite type_traits :
-
-[ type-traits-run add_const_test.cpp ]
-[ type-traits-run add_pointer_test.cpp ]
-[ type-traits-run add_reference_test.cpp ]
-[ type-traits-run add_volatile_test.cpp ]
-[ type-traits-run alignment_of_test.cpp ]
-[ type-traits-run function_traits_test.cpp ]
-[ type-traits-run has_nothrow_assign_test.cpp ]
-[ type-traits-run has_nothrow_constr_test.cpp ]
-[ type-traits-run has_nothrow_copy_test.cpp ]
-[ type-traits-run has_trivial_assign_test.cpp ]
-[ type-traits-run has_trivial_constr_test.cpp ]
-[ type-traits-run has_trivial_copy_test.cpp ]
-[ type-traits-run has_trivial_destructor_test.cpp ]
-[ type-traits-run is_arithmetic_test.cpp ]
-[ type-traits-run is_array_test.cpp ]
-[ type-traits-run is_base_and_derived_test.cpp ]
-[ type-traits-run is_class_test.cpp ]
-[ type-traits-run is_compound_test.cpp ]
-[ type-traits-run is_const_test.cpp ]
-[ type-traits-run is_convertible_test.cpp ]
-[ type-traits-run is_empty_test.cpp ]
-[ type-traits-run is_enum_test.cpp ]
-[ type-traits-run is_float_test.cpp ]
-[ type-traits-run is_function_test.cpp ]
-[ type-traits-run is_fundamental_test.cpp ]
-[ type-traits-run is_integral_test.cpp ]
-[ type-traits-run is_member_func_test.cpp ]
-[ type-traits-run is_member_pointer_test.cpp ]
-[ type-traits-run is_object_test.cpp ]
-[ type-traits-run is_pod_test.cpp ]
-[ type-traits-run is_pointer_test.cpp ]
-[ type-traits-run is_polymorphic_test.cpp ]
-[ type-traits-run is_reference_test.cpp ]
-[ type-traits-run is_same_test.cpp ]
-[ type-traits-run is_scalar_test.cpp ]
-[ type-traits-run is_stateless_test.cpp ]
-[ type-traits-run is_union_test.cpp ]
-[ type-traits-run is_void_test.cpp ]
-[ type-traits-run is_volatile_test.cpp ]
-[ type-traits-run remove_bounds_test.cpp ]
-[ type-traits-run remove_const_test.cpp ]
-[ type-traits-run remove_cv_test.cpp ]
-[ type-traits-run remove_pointer_test.cpp ]
-[ type-traits-run remove_reference_test.cpp ]
-[ type-traits-run remove_volatile_test.cpp ]
-[ type-traits-run tricky_abstract_type_test.cpp ]
-[ type-traits-run tricky_add_pointer_test.cpp ]
-[ type-traits-run tricky_function_type_test.cpp ]
-[ type-traits-run tricky_incomplete_type_test.cpp ]
-[ type-traits-run tricky_partial_spec_test.cpp ]
-[ type-traits-run type_with_alignment_test.cpp ]
-
-; # type traits suite
-
+            
+test-suite type_traits : [ all-tests ] ;