diff --git a/v2/test/boostbook.py b/v2/test/boostbook.py
new file mode 100644
index 000000000..3b134d8c7
--- /dev/null
+++ b/v2/test/boostbook.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+#  Copyright (C) Vladimir Prus 2004. Permission to copy, use, modify, sell and
+#  distribute this software is granted provided this copyright notice appears in
+#  all copies. This software is provided "as is" without express or implied
+#  warranty, and with no claim as to its suitability for any purpose.
+
+from BoostBuild import Tester, List
+
+# 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 A.html for refentry(A)
+Writing library/reference.html for section(library.reference)
+Writing index.html for chapter(library)
+Writing HTML.manifest
+""")
+t.expect_addition(["html/A.html", "html/index.html"])
+
+t.cleanup()
diff --git a/v2/test/boostbook/Jamroot b/v2/test/boostbook/Jamroot
new file mode 100644
index 000000000..fb4c96997
--- /dev/null
+++ b/v2/test/boostbook/Jamroot
@@ -0,0 +1,3 @@
+
+boostbook docs : docs.xml ;
+doxygen autodoc : [ glob *.hpp ] ;
diff --git a/v2/test/boostbook/a.hpp b/v2/test/boostbook/a.hpp
new file mode 100644
index 000000000..6375c0a82
--- /dev/null
+++ b/v2/test/boostbook/a.hpp
@@ -0,0 +1,7 @@
+
+/// A class
+class A {
+public:
+    /// A constructor
+    A();    
+};
diff --git a/v2/test/boostbook/docs.xml b/v2/test/boostbook/docs.xml
new file mode 100644
index 000000000..b1cd2561a
--- /dev/null
+++ b/v2/test/boostbook/docs.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+     "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<library 
+    name="library"
+    dirname="librarys" id="library" 
+    xmlns:xi="http://www.w3.org/2001/XInclude">
+  <libraryinfo>
+    <author>
+      <firstname>Joe</firstname>
+      <surname>Hacker</surname>
+    </author>
+    
+    <copyright>
+      <year>7002</year>
+      <holder>Joe Hacker</holder>
+    </copyright>
+
+  </libraryinfo>
+  
+  <title>Documentation</title>
+  
+  <section>
+    <title>Introduction</title>
+
+    <para>This is introduction</para>
+    
+  </section>
+   
+  <xi:include href="autodoc.boostbook"/> 
+</library>
diff --git a/v2/test/test-config-example.jam b/v2/test/test-config-example.jam
index 8b6e8f953..35642b186 100644
--- a/v2/test/test-config-example.jam
+++ b/v2/test/test-config-example.jam
@@ -8,4 +8,10 @@ import toolset : using ;
 
 using gcc ;
 using msvc : : "P:/Program Files/Microsoft Visual Studio/vc98" : : vcvars32-p.bat ;
-using borland ;
\ No newline at end of file
+using borland ;
+
+using boostbook 
+     : /home/ghost/build/docbook/xsl
+     : /home/ghost/build/docbook/dtd
+    ; 
+using doxygen ;
\ No newline at end of file
diff --git a/v2/test/test_all.py b/v2/test/test_all.py
index f7b961167..bcb1fe28d 100644
--- a/v2/test/test_all.py
+++ b/v2/test/test_all.py
@@ -141,4 +141,9 @@ if os.environ.has_key('QTDIR'):
 else:
     print 'skipping railsys test since QTDIR environment variable is unset'
 
+if "--extras" in sys.argv:
+    tests.append("boostbook")
+else:
+    print 'Note: skipping extra tests'
+
 run_tests(critical_tests, tests)