diff --git a/test/auto_ptr.cpp b/test/auto_ptr.cpp
index 1de51f23..22e2df73 100644
--- a/test/auto_ptr.cpp
+++ b/test/auto_ptr.cpp
@@ -9,8 +9,10 @@
 #include <boost/python/extract.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/implicit.hpp>
-#include "test_class.hpp"
 
+#include <boost/detail/workaround.hpp>
+
+#include "test_class.hpp"
 #include <memory>
 
 using namespace boost::python;
@@ -70,7 +72,7 @@ BOOST_PYTHON_MODULE(auto_ptr_ext)
         ;
 
     // VC6 auto_ptrs do not have converting constructors    
-#if defined(BOOST_MSVC_STD_ITERATOR)
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, < 306)
     scope().attr("broken_auto_ptr") = 1;
 #else
     scope().attr("broken_auto_ptr") = 0;
diff --git a/test/auto_ptr.py b/test/auto_ptr.py
index 426a5d84..cd83208f 100644
--- a/test/auto_ptr.py
+++ b/test/auto_ptr.py
@@ -22,7 +22,7 @@
 >>> broken_auto_ptr and -1 or look(x)
 -1
 
->>> if not '--broken-auto-ptr' in sys.argv:
+>>> if not broken_auto_ptr:
 ...     try: x.value()
 ...     except TypeError: pass
 ...     else: print 'expected a TypeError exception'