diff --git a/.zuul.yaml b/.zuul.yaml
index c4c8ef1c..1da16350 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,7 +4,6 @@
       - openstack-cover-jobs-horizon
       - openstack-lower-constraints-jobs-horizon
       - openstack-python-jobs-horizon
-      - openstack-python35-jobs-horizon
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
diff --git a/setup.cfg b/setup.cfg
index 289fbec4..3326f1f5 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 9044b6e6..be2215bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py27,pep8,py27dj19,py27dj110,py3-dj111
+envlist = py27,pep8,py27dj19,py27dj110,py3-dj111
 skipsdist = True
 
 [testenv]
@@ -15,9 +15,6 @@ commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
 [testenv:py27]
 setenv = DJANGO_SETTINGS_MODULE=manila_ui.tests.settings
 
-[testenv:py35]
-setenv = DJANGO_SETTINGS_MODULE=manila_ui.tests.settings
-
 [testenv:py36]
 setenv = DJANGO_SETTINGS_MODULE=manila_ui.tests.settings