diff --git a/.zuul.yaml b/.zuul.yaml
index d8ec2849..74c71fa5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,9 +1,7 @@
 - project:
     templates:
       - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
     check:
       jobs:
         - build-monasca-docker-image
diff --git a/setup.cfg b/setup.cfg
index ff370536..73b2425c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,8 @@ classifier=
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 43e64de9..7d6523c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,pep8,cover
+envlist = py27,py37,pep8,cover
 minversion = 2.5
 skipsdist = True