diff --git a/tools/test.sh b/tools/test.sh
index 7033b2f85d..2241d0df98 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -1,10 +1,16 @@
 #!/bin/bash -xe
 
+if [[ -d publish-docs/www/ ]]; then
+    output=publish-docs/www
+else
+    output=publish-docs/
+fi
+
 .tox/checkbuild/bin/python tools/www-generator.py --verbose --source-directory www/ \
-        --output-directory publish-docs/www/ $@
+        --output-directory $output $@
 
 if [[ $? -eq 0 ]]; then
-    rsync -a www/static/ publish-docs/www/
+    rsync -a www/static/ $output
 fi
 # publish-docs/www-index.html is the trigger for openstack-indexpage
 # to include the file.