diff --git a/.gitignore b/.gitignore
index 789b8cd4a..61a772889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,4 @@ target/
 *~
 .*.swp
 .bak
-build/
+/openstack-firstapp/build*/
diff --git a/tox.ini b/tox.ini
index 601cbae0d..c9eb31af1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,10 @@ basepython = python2.7
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = bash
+whitelist_externals =
+   bash
+   mkdir
+   rsync
 
 [testenv:venv]
 commands = {posargs}
@@ -31,7 +34,20 @@ commands =
 commands = openstack-doc-test --check-deletions {posargs}
 
 [testenv:checkbuild]
-commands = openstack-doc-test --check-build {posargs}
+commands =
+  # Build and copy RST Guides
+  # Include only environments that are (partially) written
+  # 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.
+  sphinx-build -E -W -t libcloud openstack-firstapp/doc/source openstack-firstapp/build-libcloud/html
+  mkdir -p publish-docs/openstack-firstapp-libcloud/content
+  rsync -a openstack-firstapp/build-libcloud/html/ publish-docs/openstack-firstapp-libcloud/content/
+  sphinx-build -E -W -t fog openstack-firstapp/doc/source openstack-firstapp/build-fog/html
+  mkdir -p publish-docs/openstack-firstapp-fog/content
+  rsync -a openstack-firstapp/build-fog/html/ publish-docs/openstack-firstapp-fog/content/
+  # Build DocBook Guides
+  openstack-doc-test --check-build {posargs}
 
 [testenv:publishdocs]
 # Prepare documents (without www) so that they can get published on
@@ -72,22 +88,29 @@ sitepackages=True
 whitelist_externals = doc-tools-check-languages
 commands = doc-tools-check-languages doc-tools-check-languages.conf publish all
 
+[testenv:docs]
+commands =
+   # Include only environments that are (partially) written
+   sphinx-build -E -W -t libcloud openstack-firstapp/doc/source openstack-firstapp/build-libcloud/html
+   sphinx-build -E -W -t fog openstack-firstapp/doc/source openstack-firstapp/build-fog/html
+
 [testenv:openstack-firstapp-libcloud]
-commands = sphinx-build -E -W -t libcloud openstack-firstapp/doc/source openstack-firstapp/build/html
+commands = sphinx-build -E -W -t libcloud openstack-firstapp/doc/source openstack-firstapp/build-libcloud/html
+
 [testenv:openstack-firstapp-jclouds]
-commands = sphinx-build -E -W -t jclouds openstack-firstapp/doc/source openstack-firstapp/build/html
+commands = sphinx-build -E -W -t jclouds openstack-firstapp/doc/source openstack-firstapp/build-jclouds/html
 
 [testenv:openstack-firstapp-fog]
-commands = sphinx-build -E -W -t fog openstack-firstapp/doc/source openstack-firstapp/build/html
+commands = sphinx-build -E -W -t fog openstack-firstapp/doc/source openstack-firstapp/build-fog/html
 
 [testenv:openstack-firstapp-dotnet]
-commands = sphinx-build -E -W -t dotnet openstack-firstapp/doc/source openstack-firstapp/build/html
+commands = sphinx-build -E -W -t dotnet openstack-firstapp/doc/source openstack-firstapp/build-dotnet/html
 
 [testenv:openstack-firstapp-node]
-commands = sphinx-build -E -W -t node openstack-firstapp/doc/source openstack-firstapp/build/html
+commands = sphinx-build -E -W -t node openstack-firstapp/doc/source openstack-firstapp/build-node/html
 
 [testenv:openstack-firstapp-openstacksdk]
-commands = sphinx-build -E -W -t openstacksdk openstack-firstapp/doc/source openstack-firstapp/build/html
+commands = sphinx-build -E -W -t openstacksdk openstack-firstapp/doc/source openstack-firstapp/build-openstacksdk/html
 
 [testenv:openstack-firstapp-todos]
 commands = sphinx-build -E -W -t libcloud openstack-firstapp/doc/source openstack-firstapp/build/html