diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index 349b11e6..aef3a016 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -26,7 +26,6 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'openstackdocstheme'
 ]
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 8c4bb666..9f4ab004 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,8 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
 sphinxcontrib-mermaid>=0.3.1 # BSD
 requests
diff --git a/requirements.txt b/requirements.txt
index 82774cee..3f22bc6a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=1.30.0  # Apache-2.0
+openstackdocstheme>=1.31.2  # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index adbf03d8..78b4cfaa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,15 +13,5 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
-[wheel]
-universal = 1
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
diff --git a/setup.py b/setup.py
index 566d8443..cd35c3c3 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 34ce2997..00000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-# Doc requirements
-
-flake8
-requests
-pyquery
diff --git a/tox.ini b/tox.ini
index 097c482e..93ae4544 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,18 +4,16 @@ skipsdist = True
 envlist = docs,pep8,bindep
 
 [testenv]
+basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/test-requirements.txt
-       -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+deps = -r{toxinidir}/requirements.txt
+
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
@@ -24,7 +22,6 @@ commands =
     sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
-basepython = python3
 whitelist_externals = make
 description =
   Build PDF documentation.
@@ -35,7 +32,6 @@ commands =
   make -C doc/build/pdf
 
 [testenv:pep8]
-basepython = python3
 whitelist_externals = bash
 deps = -r{toxinidir}/test-requirements.txt
 # We fail pretty horribly on bashate right now
@@ -48,9 +44,7 @@ show-source = True
 exclude = .tox,dist,*.egg,build
 
 [testenv:deploy-guide]
-basepython = python3
 deps = {[testenv:docs]deps}
-
 commands = sphinx-build -a -E -W -d deploy-guide/build/doctrees --keep-going -b html deploy-guide/source deploy-guide/build/html
 
 [testenv:bindep]