diff --git a/.zuul.yaml b/.zuul.yaml
index 6bf0c88..b234013 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,5 +2,4 @@
     templates:
       - openstack-python-jobs
       - check-requirements
-      - openstack-python35-jobs
       - openstack-python36-jobs
diff --git a/setup.cfg b/setup.cfg
index aac1c0a..ba9c057 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,7 +8,7 @@ classifiers =
     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
     Intended Audience :: System Administrators
diff --git a/tox.ini b/tox.ini
index f39dc65..ad78d7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = pep8,py27,py35
+envlist = pep8,py27,py36
 skipsdist = True
 
 [testenv]
@@ -49,8 +49,8 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools,hori
 basepython = python3
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
-[testenv:py35dj20]
-basepython = python3.5
+[testenv:py36dj20]
+basepython = python3.6
 commands =
   pip install django>=2.0,<2.1
-  {[testenv]commands}
+  {[testenv]commands}
\ No newline at end of file