diff --git a/.zuul.yaml b/.zuul.yaml
index 21970681..73b0cc06 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,7 +8,6 @@
       - lib-forward-testing-python3
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - periodic-stable-jobs
diff --git a/setup.cfg b/setup.cfg
index 9aac99cc..b0975b4c 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 d8a395c9..cc0b5154 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py27,pep8
+envlist = py36,py27,pep8
 
 [testenv]
 setenv =