diff --git a/.zuul.yaml b/.zuul.yaml
index 8a2997fee..330e5c60f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -59,7 +59,7 @@
     parent: zun-tempest-base
 
 - job:
-    name: zun-tempest-py35-docker-sql
+    name: zun-tempest-py3-docker-sql
     parent: zun-tempest-base
     vars:
       devstack_localrc:
@@ -89,7 +89,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - publish-openstack-docs-pti
@@ -97,12 +96,12 @@
     check:
       jobs:
         - zun-tempest-docker-sql
-        - zun-tempest-py35-docker-sql
+        - zun-tempest-py3-docker-sql
         - zun-tempest-docker-etcd
         - zun-tempest-multinode-docker-sql
     gate:
       queue: zun
       jobs:
         - zun-tempest-docker-sql
-        - zun-tempest-py35-docker-sql
+        - zun-tempest-py3-docker-sql
         - zun-tempest-multinode-docker-sql
diff --git a/setup.cfg b/setup.cfg
index b7237428c..56e91bf05 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 da2a4f87c..e370be082 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py36,py27,pep8,migration
+envlist = py36,py27,pep8,migration
 skipsdist = True
 
 [testenv]
@@ -66,10 +66,6 @@ commands = oslo_debug_helper {posargs}
 basepython = python2.7
 commands = oslo_debug_helper {posargs}
 
-[testenv:debug-py35]
-basepython = python3.5
-commands = oslo_debug_helper {posargs}
-
 [testenv:debug-py36]
 basepython = python3.6
 commands = oslo_debug_helper {posargs}