diff --git a/.zuul.yaml b/.zuul.yaml
index 3a9ff16..cfb739d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -28,6 +28,7 @@
       devstack_localrc:
         CINDER_ISCSI_HELPER: lioadm
         TEMPEST_PLUGINS: /opt/stack/cinder-tempest-plugin
+        USE_PYTHON3: true
       devstack_plugins:
         barbican: https://opendev.org/openstack/barbican
       devstack_services:
diff --git a/setup.cfg b/setup.cfg
index 1ae93ad..3ee7468 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,10 +13,9 @@
     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.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index f53437e..af89592 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,7 @@
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 5ea346d..4c2edbc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,13 @@
 [tox]
-minversion = 2.0
+minversion = 3.1.0
 envlist = pep8
 skipsdist = True
+# this allows tox to infer the base python from the environment name
+# and override any basepython configured in this file
+ignore_basepython_conflict=true
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install {opts} {packages}
 setenv =
@@ -14,11 +18,9 @@
 commands = python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
-basepython = python3
 commands = flake8 {posargs}
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [flake8]