diff --git a/test/boost_no_using_breaks_adl.ipp b/test/boost_no_using_breaks_adl.ipp
index f8d23520..fbf6e411 100644
--- a/test/boost_no_using_breaks_adl.ipp
+++ b/test/boost_no_using_breaks_adl.ipp
@@ -30,13 +30,13 @@ namespace boost
    }
 }
 
-namespace user
+namespace user_ns
 {
    template <class T>
    struct Y{};
 
    template <class T>
-   T* get_pointer(user::Y<T>)
+   T* get_pointer(user_ns::Y<T>)
    { return 0; }
 
    template <class T>
@@ -58,8 +58,8 @@ int test()
 {
    int i;
    typedef void* pv;
-   i = user::f(pv());
-   i = user::f(boost::inner2::X<int>());
+   i = user_ns::f(pv());
+   i = user_ns::f(boost::inner2::X<int>());
    return 0;
 }
 
diff --git a/test/link/Jamfile b/test/link/Jamfile
index 48bd6603..da55aeb8 100644
--- a/test/link/Jamfile
+++ b/test/link/Jamfile
@@ -7,6 +7,32 @@ dll link_test : link_test.cpp
     <runtime-link>dynamic
     <define>BOOST_DYN_LINK=1
     <sysinclude>$(BOOST_ROOT)
+    # make sure the names of the libraries are correctly named:
+    common-variant-tag
     : 
         debug release
     ;
+
+lib link_test : link_test.cpp 
+    : 
+    <sysinclude>$(BOOST_ROOT)
+    # make sure the names of the libraries are correctly named:
+    common-variant-tag
+    : 
+        debug release
+    ;
+
+stage stage/lib : <lib>link_test <dll>link_test
+    :
+        # copy to a path rooted at BOOST_ROOT:
+        <locate>$(BOOST_ROOT)
+        # make sure the names of the libraries are correctly named:
+        common-variant-tag
+        # add this target to the "stage" and "all" psuedo-targets:
+        <target>stage
+        <target>all
+    :
+        debug release
+    ;
+
+