diff --git a/.zuul.yaml b/.zuul.yaml
index 69c39a64c4..95a6890c71 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,8 +40,8 @@
       zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 - job:
-    name: osc-tox-py35-tips
-    parent: openstack-tox-py35
+    name: osc-tox-py36-tips
+    parent: openstack-tox-py36
     description: |
       Run unit tests for OpenStackClient with master branch of important libs.
 
@@ -180,11 +180,11 @@
     check:
       jobs:
         - osc-tox-py27-tips
-        - osc-tox-py35-tips
+        - osc-tox-py36-tips
     gate:
       jobs:
         - osc-tox-py27-tips
-        - osc-tox-py35-tips
+        - osc-tox-py36-tips
 
 - project:
     templates:
@@ -193,7 +193,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index c73f2ce9f6..db03c48423 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,6 @@ 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]
diff --git a/tox.ini b/tox.ini
index c8854e5c5d..8145179ece 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.3
-envlist = py36,py35,py27,pep8
+envlist = py36,py27,pep8
 skipdist = True
 
 [testenv]