diff --git a/.zuul.yaml b/.zuul.yaml
index f585604c..4b1177e6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -81,8 +81,8 @@
             ml2_type_vlan:
               network_vlan_ranges: foo:1:10
             agent:
-              enable_distributed_routing: True
-              l2_population: True
+              enable_distributed_routing: true
+              l2_population: true
               tunnel_types: vxlan,gre
             securitygroup:
               firewall_driver: iptables_hybrid
@@ -119,8 +119,7 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
diff --git a/setup.cfg b/setup.cfg
index f968ba17..67d874f4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,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 =