diff --git a/tox.ini b/tox.ini
index f9ff0e67de..92a417e46d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = pep8,py37,py36,py35,py27
+envlist = pep8,py27,py37
 
 [testenv]
 usedevelop = True
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 18f7f5530d..57d87bdb00 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -5,9 +5,8 @@
       - check-requirements
       - release-notes-jobs-python3
       - openstack-python-jobs
-      - openstack-python36-jobs
       - tripleo-standalone-scenarios-full
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
     check:
       jobs:
         - openstack-tox-pep8