diff --git a/test/BoostBuild.py b/test/BoostBuild.py
index 6e87d8a4e..209fba3bd 100644
--- a/test/BoostBuild.py
+++ b/test/BoostBuild.py
@@ -114,8 +114,13 @@ elif hasattr(os, "uname"):
     default_os = os.uname()[0].lower()
 
 def prepare_prefixes_and_suffixes(toolset, target_os=default_os):
-    prepare_suffix_map(toolset, target_os)
-    prepare_library_prefix(toolset, target_os)
+    ind = toolset.find('-')
+    if ind == -1:
+        rtoolset = toolset
+    else:
+        rtoolset = toolset[:ind]
+    prepare_suffix_map(rtoolset, target_os)
+    prepare_library_prefix(rtoolset, target_os)
 
 
 def prepare_suffix_map(toolset, target_os=default_os):
diff --git a/test/test_system.html b/test/test_system.html
index 6b1100f3d..c70a1177b 100644
--- a/test/test_system.html
+++ b/test/test_system.html
@@ -117,6 +117,11 @@
       <tt>test-config.jam</tt> in <tt>$boost_build_root/test</tt> directory. In
       this case, <tt>site-config.jam</tt> and <tt>user-config.jam</tt> will be
       ignored for testing.</li>
+      
+      <li>Make sure that in the configuration jam file(s) that you use you generate
+      no console output, ie. with the Boost Build 'ECHO' rule. Such console output
+      in the configuration jam file(s) will cause a number of tests to automatically
+      fail which would otherwise succeed.</li>
     </ol>
 
     <p>When all is set, you can run all the tests using the <tt>test_all.py</tt>