diff --git a/tox.ini b/tox.ini
index fb3ea91d7..5837872b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,13 +76,14 @@ commands =
   flake8 barbican setup.py
 
 [testenv:docs]
+# This environment is called from CI scripts to test and publish
+# the main docs to https://docs.openstack.org/barbican
+description = Build main documentation
 basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands=
-    rm -rf doc/build api-guide/build api-ref/build
+    rm -rf doc/build
     sphinx-build -W -b html doc/source doc/build/html
-    sphinx-build -W -b html api-guide/source api-guide/build/html
-    sphinx-build -W -b html api-ref/source api-ref/build/html
 whitelist_externals = rm
 
 [testenv:api-guide]
@@ -101,6 +102,17 @@ commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
 
+[testenv:all-docs]
+description = Build all documentation
+basepython = python3
+deps = -r{toxinidir}/doc/requirements.txt
+commands=
+    {[testenv:docs]commands}
+    {[testenv:api-guide]commands}
+    {[testenv:api-ref]commands}
+    {[testenv:releasenotes]commands}
+whitelist_externals = rm
+
 [testenv:functional]
 # This tox env is purely to make local test development easier
 # Note: This requires local running instances of Barbican and Keystone