diff --git a/tools/test-languages.sh b/tools/test-languages.sh
new file mode 100755
index 00000000..02613cc9
--- /dev/null
+++ b/tools/test-languages.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+function setup_directory {
+    SET_LANG=$1
+    shift
+    for BOOK_DIR in "$@" ; do
+        openstack-generate-docbook -l $SET_LANG -b $BOOK_DIR
+    done
+}
+
+
+function test_manuals {
+    SET_LANG=$1
+    shift
+    for BOOK in "$@" ; do
+        echo "Building $BOOK for language $SET_LANG..."
+        setup_directory $SET_LANG $BOOK
+        openstack-doc-test --check-build -l $SET_LANG --only-book $BOOK
+        RET=$?
+        if [ "$RET" -eq "0" ] ; then
+            echo "... succeeded"
+        else
+            echo "... failed"
+            BUILD_FAIL=1
+        fi
+    done
+}
+
+function test_all {
+    test_manuals 'ja' 'openstack-ops'
+}
+
+
+BUILD_FAIL=0
+test_all
+
+exit $BUILD_FAIL
diff --git a/tox.ini b/tox.ini
index 4123a1ef..218a8c58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,14 @@ commands = openstack-doc-test --check-build {posargs}
 # over.
 commands = openstack-doc-test --check-build --nocreate-index --force
 
+[testenv:checklang]
+# Generatedocbook needs xml2po which cannot be installed
+# in the venv. Since it's installed in the system, let's
+# use sitepackages.
+sitepackages=True
+whitelist_externals = bash
+commands = bash tools/test-languages.sh
+
 [testenv:buildlang]
 # Run as "tox -e buildlang -- $LANG"
 # Generatedocbook needs xml2po which cannot be installed