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
+    ;
+
+
diff --git a/test/link/test/Jamfile b/test/link/test/Jamfile
new file mode 100644
index 00000000..68f2ed89
--- /dev/null
+++ b/test/link/test/Jamfile
@@ -0,0 +1,30 @@
+# copyright John Maddock 2003
+
+subproject libs/config/test/link/test ;
+# bring in the rules for testing
+import testing ./options ;
+
+run ../main.cpp
+   : #extra depend
+   : #input-files
+   : #requirements
+    <sysinclude>$(BOOST_ROOT)
+   <library-path>../../../../../stage/lib
+   <define>BOOST_LIB_DIAGNOSTIC=1
+   : link_test ;
+
+run ../main.cpp
+   : #extra depend
+   : #input-files
+   : #requirements
+    <runtime-link>dynamic
+    <define>BOOST_DYN_LINK=1
+    <sysinclude>$(BOOST_ROOT)
+   <library-path>../../../../../stage/lib
+   <define>BOOST_LIB_DIAGNOSTIC=1
+   : link_test_dll ;
+
+
+
+
+