diff --git a/tox.ini b/tox.ini
index 8abffc4a6..590bf5d6a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,12 +30,17 @@ commands = openstack-doc-test --check-build {posargs}
 [testenv:publishdocs]
 # Prepare documents (without www) so that they can get published on
 # docs.openstack.org with just copying publish-docs/* over.
-commands = openstack-doc-test --check-build --nocreate-index --only-book api-quick-start
+commands =
+   openstack-doc-test --check-build --nocreate-index --only-book api-quick-start
+   # Remove www directory, it's published separately
+   rm -rf publish-docs/www
 
 [testenv:publishdocs-api]
 # Prepare documents (without www) so that they can get published on
-# api.openstack.org with just copying publish-docs/* over.
+# api.openstack.org with just copying publish-docs/api-ref over.
 commands =
    openstack-doc-test --check-build --nocreate-index --only-book api-ref --only-book api-ref-guides
    # We need to move api-ref-guides to the proper place:
    mv publish-docs/api-ref-guides publish-docs/api-ref/
+   # Remove www directory, it's published separately
+   rm -rf publish-docs/www