diff --git a/.zuul.yaml b/.zuul.yaml
index 9b5406b7a7..d040e27ef7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,7 +4,6 @@
       - openstack-cover-jobs
       - 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 dd3f17f125..ed1ada9171 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 71ed31f0fc..c939b2483d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36},pep8,apiexamples,cover,api-ref,releasenotes,bandit,fakemodetests,pylint
+envlist = py27,py36,pep8,apiexamples,cover,api-ref,releasenotes,bandit,fakemodetests,pylint
 minversion = 1.6
 skipsdist = True