diff --git a/.gitignore b/.gitignore
index 8fe5cf6ffa..9eb2db3111 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 target/
 bk-ha-guide.xml
 publish-docs/
+generated/
 
 # Ignore Vagrant Related Files
 acceptance_config.yml
diff --git a/tox.ini b/tox.ini
index d26bcad507..57c44a274c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,3 +25,14 @@ commands = openstack-doc-test --exceptions-file doc-test-exceptions.txt --check-
 
 [testenv:checkbuild]
 commands = openstack-doc-test --exceptions-file doc-test-exceptions.txt --check-build {posargs}
+
+
+[testenv:buildlang]
+# Run as "tox -e buildlang -- $LANG"
+commands =
+  generatedocbook -l {posargs} -b common
+  generatedocbook -l {posargs} -b glossary
+  generatedocbook -l {posargs} -b user-guide
+  generatedocbook -l {posargs} -b install-guide
+  cp doc/pom.xml generated/{posargs}/pom.xml
+  openstack-doc-test --check-build -l {posargs} --only-book install-guide