diff --git a/tox.ini b/tox.ini
index 76f72330..fea50f7b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,6 +37,8 @@ commands =
   mkdir -p publish-docs/training-guides
   openstack-doc-test --check-build {posargs}
   bash -c "tar czf publish-docs/training-guides/labs-scripts.tgz labs"
+  bash -c "labs/osbash.sh -w cluster"
+  bash -c "zip -r publish-docs/training-guides/labs-scripts.zip labs"
 
 [testenv:publishdocs]
 # Prepare all documents (except www subdir) so that they can get
@@ -49,6 +51,8 @@ commands =
   # We only publish changed manuals.
   openstack-doc-test --check-build --publish
   bash -c "tar czf publish-docs/training-guides/labs-scripts.tgz labs"
+  bash -c "labs/osbash.sh -w cluster"
+  bash -c "zip -r publish-docs/training-guides/labs-scripts.zip labs"
 
 [testenv:checklang]
 # Generatedocbook needs xml2po which cannot be installed