diff --git a/.zuul.yaml b/.zuul.yaml
index dc276615..7332a874 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 - project:
     templates:
       - python35-charm-jobs
+      - openstack-python3-train-jobs
       - openstack-cover-jobs
diff --git a/setup.cfg b/setup.cfg
index 9e144ea9..d39de517 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,6 +11,11 @@ classifier =
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [nosetests]
 verbosity=2
diff --git a/tox.ini b/tox.ini
index 87755245..37c3f031 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # This file is managed centrally by release-tools and should not be modified
 # within individual charm repos.
 [tox]
-envlist = pep8,py3
+envlist = pep8,py37
 skipsdist = True
 
 [testenv]
@@ -26,6 +26,11 @@ basepython = python3.6
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py37]
+basepython = python3.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:py3]
 basepython = python3
 deps = -r{toxinidir}/requirements.txt