diff --git a/.zuul.yaml b/.zuul.yaml
index a10e00d..6ce3e93 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs-horizon
-      - openstack-python35-jobs-horizon
+      - openstack-python36-jobs-horizon
       - openstack-python36-jobs
     check:
       jobs:
diff --git a/setup.cfg b/setup.cfg
index 4bb1f34..7086822 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,7 +8,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
     Environment :: OpenStack
     Intended Audience :: Information Technology
diff --git a/tox.ini b/tox.ini
index 9ce0ddc..7d501ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py35,py27,pep8
+envlist = py36,py27,pep8
 
 [testenv]
 usedevelop = True