diff --git a/.gitignore b/.gitignore
index 9a90fad..df0ab22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ results
 
 # Packages
 *.egg
+*.eggs
 *.egg-info
 dist
 build
diff --git a/.zuul.yaml b/.zuul.yaml
index 5c42eb1..fe6befa 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,4 @@
 - project:
     templates:
-      - openstack-python-jobs-no-constraints
       - openstack-python37-jobs-no-constraints
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index da8f49f..df06f43 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,8 +13,6 @@ 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.7
 
diff --git a/tox.ini b/tox.ini
index 9cae607..4498790 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,14 @@
 [tox]
-minversion = 1.6
-envlist = py27,py35,pep8,docs
+minversion = 3.1.0
+envlist = py3,pep8,docs
 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]
 usedevelop = True
+basepython = python3
 install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
@@ -13,7 +17,6 @@ deps = -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html