diff --git a/.zuul.yaml b/.zuul.yaml
index da5b5389d..067c17410 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,6 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - publish-openstack-docs-pti
@@ -11,12 +10,12 @@
     check:
       jobs:
         - senlin-dsvm-tempest-py27-api
-        - senlin-dsvm-tempest-py35-api
+        - senlin-dsvm-tempest-py3-api
         - senlin-dsvm-tempest-py27-functional
-        - senlin-dsvm-tempest-py35-functional
+        - senlin-dsvm-tempest-py3-functional
         - senlin-dsvm-tempest-py27-integration:
             voting: false
-        - senlin-dsvm-tempest-py35-integration:
+        - senlin-dsvm-tempest-py3-integration:
             voting: false
         - openstack-tox-cover:
             voting: false
@@ -108,7 +107,7 @@
       - openstack/zaqar-tempest-plugin
 
 - job:
-    name: senlin-dsvm-tempest-py35-api
+    name: senlin-dsvm-tempest-py3-api
     parent: senlin-tempest-base
     vars:
       tempest_test_regex: senlin_tempest_plugin.tests.api
@@ -121,7 +120,7 @@
                cloud_backend: openstack_test
 
 - job:
-    name: senlin-dsvm-tempest-py35-functional
+    name: senlin-dsvm-tempest-py3-functional
     parent: senlin-tempest-base
     vars:
       tempest_test_regex: senlin_tempest_plugin.tests.functional
@@ -135,7 +134,7 @@
                health_check_interval_min: 10
 
 - job:
-    name: senlin-dsvm-tempest-py35-integration
+    name: senlin-dsvm-tempest-py3-integration
     parent: senlin-tempest-base
     vars:
       tempest_test_regex: senlin_tempest_plugin.tests.integration
diff --git a/setup.cfg b/setup.cfg
index 5b7be05bc..0a01d9a3f 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 6ba7ef81e..7ffec961f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py35,py27,pep8,functional
+envlist = py36,py27,pep8,functional
 skipsdist = True
 
 [testenv]
@@ -31,8 +31,8 @@ commands = oslo_debug_helper -t senlin/tests/unit {posargs}
 basepython = python2.7
 commands = oslo_debug_helper -t senlin/tests/unit {posargs}
 
-[testenv:debug-py35]
-basepython = python3.5
+[testenv:debug-py36]
+basepython = python3.6
 commands = oslo_debug_helper -t senlin/tests/unit {posargs}
 
 [testenv:pep8]