diff --git a/.zuul.yaml b/.zuul.yaml
index c314d732..2a2ef61a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - check-requirements
diff --git a/setup.cfg b/setup.cfg
index b4bd84e6..a60efdb5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,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 a5b340e2..0861ad2d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy,py35,py27,pep8
+envlist = pypy,py36,py27,pep8
 minversion = 2.0
 skipsdist = True