diff --git a/v2/test/boostbook.py b/v2/test/boostbook.py
index 17edc636c..703002bd1 100644
--- a/v2/test/boostbook.py
+++ b/v2/test/boostbook.py
@@ -5,17 +5,19 @@
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
from BoostBuild import Tester, List
+import string
# Create a temporary working directory
t = Tester()
t.set_tree("boostbook")
# For some reason, the messages are sent to stderr.
-t.run_build_system(stderr="""Writing boost/A.html for refentry(boost.A)
+t.run_build_system()
+t.fail_test(string.find(t.stdout(), """Writing boost/A.html for refentry(boost.A)
Writing library/reference.html for section(library.reference)
Writing index.html for chapter(library)
-Writing HTML.manifest
-""")
+Writing docs_HTML.manifest
+""") == -1)
t.expect_addition(["html/boost/A.html", "html/index.html"])
t.cleanup()
diff --git a/v2/test/boostbook/Jamroot b/v2/test/boostbook/Jamroot
index fb4c96997..94564ca29 100644
--- a/v2/test/boostbook/Jamroot
+++ b/v2/test/boostbook/Jamroot
@@ -1,3 +1,3 @@
-boostbook docs : docs.xml ;
+boostbook docs : docs.xml autodoc ;
doxygen autodoc : [ glob *.hpp ] ;
diff --git a/v2/test/boostbook/docs.xml b/v2/test/boostbook/docs.xml
index 4eaea358d..c2d9b1f88 100644
--- a/v2/test/boostbook/docs.xml
+++ b/v2/test/boostbook/docs.xml
@@ -32,5 +32,5 @@
-
+