diff --git a/.zuul.yaml b/.zuul.yaml
index fc911ab..5e6f530 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,5 @@
     templates:
       - check-requirements
       - openstack-python-jobs-horizon
-      - openstack-python35-jobs-horizon
       - openstack-python36-jobs-horizon
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index 79d62fc..29ea4bb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,8 +16,7 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index a6a8269..1019df7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py27,pep8
+envlist = py27,py36,pep8
 skipsdist = True
 
 [testenv]
@@ -24,11 +24,6 @@ commands = flake8
 basepython = python3
 commands = {posargs}
 
-[testenv:py35dj20]
-basepython = python3.5
-commands = pip install django>=2.0,<2.1
-           /bin/bash run_tests.sh -N --no-pep8 {posargs}
-
 [testenv:py27integration]
 basepython = python2.7
 commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}