diff --git a/.zuul.yaml b/.zuul.yaml
index 889a6716..db5e1a5b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,6 @@
 - project:
     templates:
       - openstack-lower-constraints-jobs
+      - openstack-python-jobs-neutron
+      - openstack-python36-jobs
+      - check-requirements
diff --git a/setup.cfg b/setup.cfg
index 5b5a338e..842df8a5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index edb052c6..0849be53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py27,pep8,docs
+envlist = py36,py27,pep8,docs
 minversion = 2.0
 skipsdist = True