diff --git a/.zuul.yaml b/.zuul.yaml
index 0f13f836..403b8006 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -112,6 +112,7 @@
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
+      - openstack-python37-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
     check:
diff --git a/tox.ini b/tox.ini
index 4d460d8b..d029afcb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,8 @@
 [tox]
-minversion = 2.0
-envlist = py{27,35,36},pep8,docs
+minversion = 3.1
+envlist = pep8,py{37,36,35,27},docs
+ignore_basepython_conflict = True
+skip_missing_interpreters = True
 
 [testenv]
 usedevelop = True