diff --git a/.zuul.yaml b/.zuul.yaml
index 7c8c794..3e4d7eb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,6 @@
     templates:
       - openstack-cover-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - release-notes-jobs-python3
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index 0dc8029..2cb075c 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 cb5ca00..5812488 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py{36,35,27,py},pep8,pip-check-reqs
+envlist = py{36,27,py},pep8,pip-check-reqs
 skipsdist = True
 
 [testenv]