diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index ac5c62ba..86a1e541 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -2,18 +2,6 @@
 use-project /boost/python : ../build ;
 project /boost/python/test ;
 
-# A bug in the Win32 intel compilers causes compilation of one of our
-# tests to take forever when debug symbols are enabled. This rule
-# turns them off when added to the requirements section
-#rule turn-off-intel-debug-symbols ( toolset variant : properties * )
-#{
-#    if $(NT) && [ MATCH (.*intel.*) : $(toolset) ]
-#    {
-#        properties = [ difference $(properties) : <debug-symbols>on ] <debug-symbols>off ;
-#    }
-#    return $(properties) ;
-#}
-
 rule py-run ( sources * )
 {
     return [ run $(sources) /boost/python//boost_python ] ;
@@ -40,7 +28,7 @@ rule py-compile-fail ( sources * )
 
 test-suite python
   :
-   [ run ../test/embedding.cpp ../build//boost_python /python//python ]
+#   [ run ../test/embedding.cpp ../build//boost_python /python//python ]
 
 [
 bpl-test crossmod_exception
@@ -52,9 +40,15 @@ bpl-test crossmod_exception
 [ bpl-test return_arg ]
 [ bpl-test staticmethod ]
 [ bpl-test shared_ptr ]
+[ bpl-test andreas_beyer ]
 [ bpl-test polymorphism ]
 [ bpl-test polymorphism2 ]
+
+[ bpl-test wrapper_held_type ]
+[ bpl-test polymorphism2_auto_ptr ]
+
 [ bpl-test auto_ptr ]
+
 [ bpl-test minimal ]
 [ bpl-test args ]
 [ bpl-test raw_ctor ]
@@ -93,12 +87,16 @@ bpl-test crossmod_exception
 [ bpl-test bienstman1 ]
 [ bpl-test bienstman2 ]
 [ bpl-test bienstman3 ]
-#
-#[ bpl-test multi_arg_constructor
-#  : # files
-#  : # requirements
-#  turn-off-intel-debug-symbols ] # debug symbols slow the build down too much
-#
+
+[ bpl-test multi_arg_constructor
+  : # files
+  : # requirements
+    # A bug in the Win32 intel compilers causes compilation of one of our
+    # tests to take forever when debug symbols are enabled. This rule
+    # turns them off when added to the requirements section
+    <toolset>intel-win:<debug-symbols>off
+]
+
 [ bpl-test iterator : iterator.py iterator.cpp input_iterator.cpp ]
 
 [ bpl-test stl_iterator : stl_iterator.py stl_iterator.cpp ]