diff --git a/.zuul.yaml b/.zuul.yaml
index 6ebb3168..eaaf26b5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,7 +39,7 @@
 - project:
     templates:
       - openstack-python-jobs-neutron
-      - openstack-python35-jobs-neutron
+      - openstack-python36-jobs-neutron
       - openstack-python36-jobs
       - check-requirements
       - publish-openstack-docs-pti
@@ -56,10 +56,6 @@
             required-projects:
               - openstack/neutron
               - openstack/networking-sfc
-        - openstack-tox-py35:
-            required-projects:
-              - openstack/neutron
-              - openstack/networking-sfc
         - openstack-tox-py36:
             required-projects:
               - openstack/neutron
@@ -77,10 +73,6 @@
             required-projects:
               - openstack/neutron
               - openstack/networking-sfc
-        - openstack-tox-py35:
-            required-projects:
-              - openstack/neutron
-              - openstack/networking-sfc
         - openstack-tox-py36:
             required-projects:
               - openstack/neutron
diff --git a/setup.cfg b/setup.cfg
index 28b44c73..4c756aa7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,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 f6da1530..300b0aa8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py27,pypy,pep8
+envlist = py36,py27,pypy,pep8
 skipsdist = True
 
 [testenv]