diff --git a/setup.cfg b/setup.cfg
index a3d81b2..3481f20 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,26 +24,3 @@ packages =
 [entry_points]
 tempest.test_plugins =
     blazar_tests = blazar_tempest_plugin.plugin:BlazarTempestPlugin
-
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
-[compile_catalog]
-directory = blazar_tempest_plugin/locale
-domain = blazar_tempest_plugin
-
-[update_catalog]
-domain = blazar_tempest_plugin
-output_dir = blazar_tempest_plugin/locale
-input_file = blazar_tempest_plugin/locale/blazar_tempest_plugin.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = blazar_tempest_plugin/locale/blazar_tempest_plugin.pot
diff --git a/test-requirements.txt b/test-requirements.txt
index f4b6f8e..c89984d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 # docs
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.0.0 # Apache-2.0
 # releasenotes
 reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d051c4e..3408e40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,21 @@
 [tox]
 minversion = 3.1.1
-envlist = py36,py37,pypy,pep8
+envlist = py36,py37,docs,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
    OS_STDOUT_CAPTURE=1
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
@@ -34,7 +35,8 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+    sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 whitelist_externals = make