diff --git a/.zuul.yaml b/.zuul.yaml
index 8a2551a2c3..a4fadfb132 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,6 @@
       - build-openstack-docs-pti
       - check-requirements
       - openstack-python-jobs-neutron
-      - openstack-python35-jobs-neutron
       - openstack-python36-jobs
     check:
       jobs:
@@ -33,19 +32,6 @@
               - openstack/neutron-vpnaas
               - x/tap-as-a-service
               - openstack/octavia
-        - openstack-tox-py35:
-            timeout: 5400
-            required-projects:
-              - openstack/neutron
-              - openstack/networking-l2gw
-              - openstack/networking-sfc
-              - openstack/neutron-lbaas
-              - x/vmware-nsxlib
-              - openstack/neutron-fwaas
-              - openstack/neutron-dynamic-routing
-              - openstack/neutron-vpnaas
-              - x/tap-as-a-service
-              - openstack/octavia
         - openstack-tox-py36:
             timeout: 5400
             required-projects:
@@ -88,19 +74,6 @@
               - openstack/neutron-vpnaas
               - x/tap-as-a-service
               - openstack/octavia
-        - openstack-tox-py35:
-            timeout: 5400
-            required-projects:
-              - openstack/neutron
-              - openstack/networking-l2gw
-              - openstack/networking-sfc
-              - openstack/neutron-lbaas
-              - x/vmware-nsxlib
-              - openstack/neutron-fwaas
-              - openstack/neutron-dynamic-routing
-              - openstack/neutron-vpnaas
-              - x/tap-as-a-service
-              - openstack/octavia
         - openstack-tox-py36:
             timeout: 5400
             required-projects:
diff --git a/setup.cfg b/setup.cfg
index 9d0b343d5b..e9d442d4a1 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 c5c8412789..f38de64913 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py27,pep8,docs
+envlist = py36,py27,pep8,docs
 minversion = 2.0
 skipsdist = True