diff --git a/tox.ini b/tox.ini
index c1f1b3f59..60de9f1da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py27,pypy,pep8
+envlist = pep8,py37,py36,py35,py27
 skipsdist = True
 
 [testenv]
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 656334887..a8b6882cf 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -5,6 +5,7 @@
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
+      - openstack-python37-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - tripleo-multinode-baremetal-minimal