diff --git a/.zuul.yaml b/.zuul.yaml
index 15aaf0cdfa..a4620c34be 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -106,7 +106,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - publish-openstack-docs-pti
       - check-requirements
diff --git a/setup.cfg b/setup.cfg
index 2cdbedc91e..7e01495c95 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]
 data_files =
diff --git a/tox.ini b/tox.ini
index c8b2dab6de..9cd4e0499f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py35,py27,pep8
+envlist = py36,py27,pep8
 minversion = 1.6
 skipsdist = True