diff --git a/tox.ini b/tox.ini
index 94509856c9..e80db6ee08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,9 +37,7 @@ commands = openstack-doc-test --check-build {posargs}
 # published on docs.openstack.org with just copying publish-docs/*
 # over.
 commands = 
-  openstack-doc-test --check-build --nocreate-index --force
-  # Remove www directory, it's in the wrong location
-  rm -rf publish-docs/www
+  openstack-doc-test --check-build --publish --force
   # Publish install-guide and config-reference to /icehouse
   # TODO(jaegerandi): Remove these lines before we branch off an
   # icehouse branch.
@@ -66,7 +64,7 @@ commands =
   # cp doc/pom.xml generated/{posargs}/pom.xml
   # Thus replaced by the next one:
   bash ./tools/copy_pom {posargs}
-  openstack-doc-test --check-build -l {posargs} --only-book install-guide --nocreate-index
+  openstack-doc-test --check-build --publish -l {posargs} --only-book install-guide
 
 [testenv:buildlang-misc]
 # Run as "tox -e buildlang-misc -- $LANG"
@@ -86,4 +84,4 @@ commands =
   # cp doc/pom.xml generated/{posargs}/pom.xml
   # Thus replaced by the next one:
   bash ./tools/copy_pom {posargs}
-  openstack-doc-test --check-build -l {posargs} --only-book security-guide --nocreate-index
+  openstack-doc-test --check-build --publish -l {posargs} --only-book security-guide