diff --git a/setup.cfg b/setup.cfg
index 2a6cebe..0f0c37f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,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 =
     ironic_inspector_client
diff --git a/tox.ini b/tox.ini
index 1e38a9c..84ed772 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,13 +27,18 @@ deps = {[testenv]deps}
 commands =
     python -m ironic_inspector_client.test.functional
 
-[testenv:functional-py35]
+[testenv:functional-py3]
 basepython = python3
 deps = {[testenv]deps}
     -r{toxinidir}/functest-requirements.txt
 commands =
     python -m ironic_inspector_client.test.functional
 
+[testenv:functional-py36]
+basepython = python3.6
+deps = {[testenv:functional-py3]deps}
+commands = {[testenv:functional-py3]commands}
+
 [testenv:func]
 # Replaced in CI with "functional" environment but kept here as a
 # backwards-compatibility shim for transition
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index a0fd40f..a7d1c96 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,7 +1,6 @@
 - project:
     templates:
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - publish-openstack-docs-pti
@@ -11,14 +10,14 @@
     check:
       jobs:
         - openstack-tox-functional
-        - openstack-tox-functional-py35
+        - openstack-tox-functional-py36
         - python-ironic-inspector-client-tempest-python2
         - python-ironic-inspector-client-tempest-python3
         - openstack-tox-lower-constraints
     gate:
       jobs:
         - openstack-tox-functional
-        - openstack-tox-functional-py35
+        - openstack-tox-functional-py36
         - python-ironic-inspector-client-tempest-python2
         - python-ironic-inspector-client-tempest-python3
         - openstack-tox-lower-constraints