diff --git a/test-requirements.txt b/test-requirements.txt
index cfe9298eef..980cc2e532 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ hacking>=0.10.0,<0.11
 
 beautifulsoup4
 Jinja2>=2.6  # BSD License (3 clause)
-openstack-doc-tools>=0.23
+openstack-doc-tools>=0.25
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 openstackdocstheme>=1.0.7
 doc8  # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 712b5dae71..b473439087 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,22 +45,19 @@ commands =
   cp www/www-index.html publish-docs/
   rsync -a www/static/ publish-docs/www/
   # Build and copy RST Guides
-  # TODO(ajaeger): We publish to content to allow for reviewing, this needs a
-  # change of openstack-doc-tools to remove content here in the file layout
-  # for previewing.
   # Build both RST User Guides
   {toxinidir}/tools/build-user-guides.sh
   # Copy RST user-guide
-  mkdir -p publish-docs/user-guide/content/
-  rsync -a doc/user-guides/build/html/ publish-docs/user-guide/content
-  # Copy RST user-guide-admincontent
-  mkdir -p publish-docs/user-guide-admin/content/
-  rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/content/
+  mkdir -p publish-docs/user-guide/
+  rsync -a doc/user-guides/build/html/ publish-docs/user-guide/
+  # Copy RST user-guide-admin
+  mkdir -p publish-docs/user-guide-admin/
+  rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/
   # Build RST networking guide
   {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
   sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html
-  mkdir -p publish-docs/networking-guide/content/
-  rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/content/
+  mkdir -p publish-docs/networking-guide/
+  rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/
   # Build DocBook Guides, note we do not build the DocBook XML Networking Guide
   openstack-doc-test --check-build --ignore-book networking-guide {posargs}