diff --git a/.zuul.yaml b/.zuul.yaml
index 6ce3e93..0cf1b49 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,8 +3,8 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs-horizon
-      - openstack-python36-jobs-horizon
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs-horizon
+      - openstack-python3-train-jobs
     check:
       jobs:
         - horizon-openstack-tox-python3-django111
diff --git a/setup.cfg b/setup.cfg
index 7086822..83e9e7d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
diff --git a/tox.ini b/tox.ini
index 98bee91..86701d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py36,py27,pep8
+envlist = py27,py37,pep8
 
 [testenv]
 usedevelop = True