diff --git a/.zuul.yaml b/.zuul.yaml
index f83e6d4..516dcef 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,4 +3,4 @@
       - check-requirements
       - publish-openstack-docs-pti
       - openstack-python-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
diff --git a/setup.cfg b/setup.cfg
index 2ca279c..2e4a82e 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
 
 [entry_points]
 console_scripts =
diff --git a/tox.ini b/tox.ini
index 1506eaa..6a57f84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py27,pypy,pep8
+envlist = py27,py36,py37,pypy,pep8
 skipsdist = True
 
 [testenv]