diff --git a/README.rst b/README.rst
index 04e36ab1b..16a5a6699 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,7 @@ install the Python tox package and run ``tox`` from the top-level directory.
 
 To run individual tests:
 
- * ``tox -e checkniceness`` - Niceness tests
+ * ``tox -e linters`` - Niceness tests
  * ``tox -e checkbuild`` - Builds all of the documents in this repository
 
 To run these tests, the Tox package uses the
diff --git a/tox.ini b/tox.ini
index 20459462c..601a6c00d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = checkniceness,checkbuild
+envlist = linters,checkbuild
 skipsdist = True
 
 [testenv]
@@ -17,15 +17,11 @@ whitelist_externals =
 [testenv:venv]
 commands = {posargs}
 
-[testenv:checkniceness]
+[testenv:linters]
 commands =
   doc8 firstapp
   doc8 api-quick-start
 
-[testenv:linters]
-# This will replace checkniceness with Zuul v3
-commands =  {[testenv:checkniceness]commands}
-
 [testenv:checkbuild]
 commands =
   # Build and copy RST Guides
@@ -44,22 +40,6 @@ commands =
   # Build website index
   {toxinidir}/tools/build-index.sh publish
 
-[testenv:publishdocs-api]
-# publishdocs will replace this, leave this in for transition
-whitelist_externals =
-  mkdir
-  mv
-commands =
-  {[testenv:publishdocs]commands}
-  # Now move everything to api-ref directory since that's where
-  # OpenStack CI expects it with this job.
-  # We need to move the content of publish-docs into publish-docs/api-ref.
-  # Tox does not allow us using wildcards here.
-  mkdir .newdir
-  # This renames publish-docs to api-ref
-  mv publish-docs .newdir/api-ref
-  mv .newdir publish-docs
-
 [testenv:checklang]
 whitelist_externals = doc-tools-check-languages
 commands = doc-tools-check-languages doc-tools-check-languages.conf test all
@@ -84,22 +64,6 @@ commands =
    rm -rf publish-docs
    doc-tools-check-languages doc-tools-check-languages.conf publish all
 
-[testenv:publishlang-api]
-# publishlang will replace this, leave this in for transition
-whitelist_externals =
-  mkdir
-  mv
-commands =
-  {[testenv:publishlang]commands}
-  # Now move everything to api-ref directory since that's where
-  # OpenStack CI expects it with this job.
-  # We need to move the content of publish-docs into publish-docs/api-ref.
-  # Tox does not allow us using wildcards here.
-  mkdir .newdir
-  # This renames publish-docs to api-ref
-  mv publish-docs .newdir/api-ref
-  mv .newdir publish-docs
-
 [testenv:generatepot-rst]
 # Generate POT files for translation, needs {posargs} like:
 # tox -e generatepot-rst -- firstapp