diff --git a/setup.cfg b/setup.cfg
index c9236aa..7d5eaf2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,11 @@ classifier =
 	License :: OSI Approved :: Apache Software License
 	Operating System :: OS Independent
 	Programming Language :: Python
+	Programming Language :: Python :: 2
+	Programming Language :: Python :: 2.7
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
 
 [files]
 packages = 
diff --git a/tox.ini b/tox.ini
index cf068af..5cc1ad6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = py27,pep8
+envlist = py27,py37,pep8
 
 [testenv]
 usedevelop = True
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index c169fb0..a6082e7 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -3,6 +3,5 @@
       - check-requirements
       - openstack-cover-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - tripleo-multinode-container-minimal