diff --git a/doc/tr1.qbk b/doc/tr1.qbk
index 36be0f6..f0230a7 100644
--- a/doc/tr1.qbk
+++ b/doc/tr1.qbk
@@ -126,14 +126,14 @@ set up the include paths as follows:
 Regardless of how the includes are setup, user code written to work 
 with Boost.TR1 is exactly the same as code written to use a native 
 tr1 implementation.  That is, references to classes and functions
-need to explicitly use the `std::tr1` namespace or a `using std::tr1`
+need to explicitly use the `std::tr1` namespace or a `using namespace std::tr1`
 statement.  For example, 
 
    std::tr1::tuple<int, std::string> t = std::tr1::make_tuple(10, "hello");
 
 or
 
-  using std::tr1;
+  using namespace std::tr1;
   tuple<int, std::string> t = make_tuple(10, "hello");
 
 
diff --git a/test/run_complex_overloads.cpp b/test/run_complex_overloads.cpp
index 797f8f7..69c0711 100644
--- a/test/run_complex_overloads.cpp
+++ b/test/run_complex_overloads.cpp
@@ -9,9 +9,8 @@
 #include <boost/tr1/complex.hpp>
 #endif
 
-#include <boost/test/test_tools.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#define BOOST_TEST_MODULE run_complex_overloads
+#include <boost/test/included/unit_test.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/mpl/if.hpp>
@@ -21,8 +20,8 @@
 #include <iomanip>
 
 #ifndef VERBOSE
-#undef BOOST_MESSAGE
-#define BOOST_MESSAGE(x)
+#undef BOOST_TEST_MESSAGE
+#define BOOST_TEST_MESSAGE(x)
 #endif
 
 //
@@ -143,13 +142,12 @@ void do_check(int i)
    do_check(static_cast<double>(i));
 }
 
-int test_main(int, char*[])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    do_check(0);
    do_check(0.0);
    do_check(1);
    do_check(1.5);
    do_check(0.5);
-   return 0;
 }