diff --git a/setup.cfg b/setup.cfg
index 58a826098..675b81d37 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     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 b47cecdf9..92b2a404c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.8
-envlist = pep8,py35,py36,py27,molecule
+envlist = pep8,py27,py37,molecule
 skipsdist = True
 
 [testenv]
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2a8eae1ce..a2c1d07f6 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -2,8 +2,7 @@
     templates:
       - tripleo-multinode-container-minimal
       - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - openstack-tox-molecule
       - check-requirements
       - publish-openstack-docs-pti