diff --git a/.zuul.yaml b/.zuul.yaml
index ee638a6..9576d1f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,7 +11,6 @@
 
 - project:
     templates:
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - check-requirements
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index 3897d3c..8af2e9c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/os-api-ref/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,25 +14,17 @@ 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.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: Implementation :: CPython
+
 
 [files]
 packages =
     os_api_ref
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = os_api_ref/locale
 domain = os_api_ref
diff --git a/tox.ini b/tox.ini
index a54e3ab..6995548 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-minversion = 2.0
-envlist = py27,py37,pep8,docs
+minversion = 3.1.1
+envlist = py37,pep8,docs
+ignore_basepython_conflict = True
 skipsdist = True
 
 [testenv]
+basepython = python3
 setenv =
     VIRTUAL_ENV={envdir}
-install_command = pip install -U {opts} {packages}
 deps =
      -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
      -r{toxinidir}/requirements.txt
@@ -14,18 +15,15 @@ deps =
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8 {posargs}
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-basepython = python3
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
     -r{toxinidir}/requirements.txt
@@ -33,7 +31,6 @@ deps =
 commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:debug]
-basepython = python3
 commands = oslo_debug_helper {posargs}
 
 [flake8]