diff --git a/.zuul.yaml b/.zuul.yaml
index 2a7c0ac..f37b82a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,7 @@
       - openstack-cover-jobs-horizon
       - openstack-lower-constraints-jobs
       - openstack-python-jobs-horizon
-      - openstack-python36-jobs-horizon
-      - openstack-python37-jobs-horizon
+      - openstack-python3-train-jobs-horizon
       - publish-openstack-docs-pti
     check:
       jobs:
diff --git a/setup.cfg b/setup.cfg
index d4f907d..576b326 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     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 2fe276c..af090df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py36,py27,pep8
+envlist = py27,py37,pep8
 skipsdist = True
 
 [testenv]