diff --git a/doc-test.conf b/doc-test.conf
index 8268ba9..06d3428 100644
--- a/doc-test.conf
+++ b/doc-test.conf
@@ -2,6 +2,8 @@
 repo_name = object-api
 api_site = True
 
-# These two options need to come as pairs:
+# These three options need to come together:
 book = openstack-object-storage-dev
 target_dir = target/docbkx/webhelp/api/openstack-object-storage/1.0
+# Published at http://docs.openstack.org/api/openstack-object-storage/1.0
+publish_dir = api/openstack-object-storage/1.0
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 33bb1da..11fb53a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,13 +12,18 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
 [testenv:checkniceness]
-commands = openstack-doc-test  --api-site --check-niceness {posargs}
+commands = openstack-doc-test --check-niceness {posargs}
 
 [testenv:checksyntax]
-commands = openstack-doc-test  --api-site --check-syntax {posargs}
+commands = openstack-doc-test --check-syntax {posargs}
 
 [testenv:checkdeletions]
-commands = openstack-doc-test  --api-site --check-deletions {posargs}
+commands = openstack-doc-test --check-deletions {posargs}
 
 [testenv:checkbuild]
-commands = openstack-doc-test  --api-site --check-build {posargs}
+commands = openstack-doc-test --check-build {posargs}
+
+[testenv:publishdocs]
+# Prepare all documents so that they can get published on
+# docs.openstack.org with just copying publish-docs/* over.
+commands = openstack-doc-test --check-build --nocreate-index --force