diff --git a/.zuul.yaml b/.zuul.yaml
index 8f326229..56009aa0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,5 +2,5 @@
     templates:
       - openstack-python-jobs
       - nodejs4-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - build-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index 96d7ce4e..78cae958 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 55b3bfe4..b2c3a681 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py34,py27,pep8,npm-test,npm-lint
+envlist = py27,py36,py37,pep8,npm-test,npm-lint
 minversion = 2.0
 skipsdist = True