diff --git a/tools/test-languages.sh b/tools/test-languages.sh
index 5e31960961..7a9f5cd93f 100755
--- a/tools/test-languages.sh
+++ b/tools/test-languages.sh
@@ -35,17 +35,13 @@ function test_ja {
                 --only-book user-guide-admin
             RET=$?
             ;;
-        publish-install)
-            setup_directory 'ja' 'install-guide'
-            openstack-doc-test -v --publish --check-build -l ja \
-                --only-book install-guide
-            RET=$?
-            ;;
         publish)
             setup_directory 'ja' 'high-availability-guide' \
-                'user-guide' 'user-guide-admin'
+                'install-guide' 'user-guide' \
+                'user-guide-admin'
             openstack-doc-test -v --publish --check-build -l ja \
                 --only-book high-availability-guide \
+                --only-book install-guide \
                 --only-book user-guide \
                 --only-book user-guide-admin
             RET=$?
@@ -62,9 +58,9 @@ function test_ja {
 function test_language () {
 
     case "$language" in
-	all)
-	    test_ja
-	    ;;
+        all)
+            test_ja
+            ;;
         ja)
             test_ja
             ;;
@@ -78,7 +74,7 @@ function test_language () {
 function usage () {
     echo "Call the script as: "
     echo "$0 PURPOSE LANGUAGE1 LANGUAGE2..."
-    echo "PURPOSE is either 'test', 'publish' or 'publish-install'"
+    echo "PURPOSE is either 'test' or 'publish'."
     echo "LANGUAGE can also be 'all'."
 }
 
@@ -90,8 +86,6 @@ if [ "$1" = "test" ] ; then
    PURPOSE="test"
 elif [ "$1" = "publish" ] ; then
    PURPOSE="publish"
-elif [ "$1" = "publish-install" ] ; then
-   PURPOSE="publish-install"
 else
     usage
     exit 1
diff --git a/tox.ini b/tox.ini
index c25153bbea..224f335d7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,23 +56,14 @@ sitepackages=True
 whitelist_externals = bash
 commands = bash tools/test-languages.sh test all
 
-[testenv:buildlang-install]
-# Run as "tox -e buildlang-install -- $LANG"
+[testenv:buildlang]
+# Run as "tox -e buildlang -- $LANG"
 # 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 publish-install {posargs}
-
-[testenv:buildlang-misc]
-# Run as "tox -e buildlang-misc -- $LANG"
-# 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 publish {posargs}
+commands = bash tools/test-languages.sh test {posargs}
 
 [testenv:publishlang]
 # Generatedocbook needs xml2po which cannot be installed
@@ -80,6 +71,4 @@ commands = bash tools/test-languages.sh publish {posargs}
 # use sitepackages.
 sitepackages=True
 whitelist_externals = bash
-commands = 
-   bash tools/test-languages.sh publish all
-   bash tools/test-languages.sh publish-install all
+commands = bash tools/test-languages.sh publish all