diff --git a/setup.cfg b/setup.cfg
index 96b078122..8c5f9f195 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,8 +19,8 @@ classifier =
     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/tox.ini b/tox.ini
index 84e34c672..0b670318e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = pep8,py37,py36,py35,py27
+envlist = pep8,py27,py37,py36
 skipsdist = True
 
 [testenv]
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 6ced5470c..d5e9753bc 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -4,9 +4,9 @@
       - openstack-lower-constraints-jobs
       - openstackclient-plugin-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - tripleo-buildimage-jobs
@@ -18,14 +18,12 @@
       jobs:
         - openstack-tox-pep8
         - openstack-tox-py27
-        - openstack-tox-py35
         - openstack-tox-py36
         - openstack-tox-py37
         - tripleo-ci-centos-7-containers-multinode:
             dependencies: &deps_unit_lint
               - openstack-tox-pep8
               - openstack-tox-py27
-              - openstack-tox-py35
               - openstack-tox-py36
               - openstack-tox-py37
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades: