diff --git a/.zuul.yaml b/.zuul.yaml
index e669a2f5..4973e5f5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -66,7 +66,7 @@
     parent: kuryr-libnetwork-fullstack-base
 
 - job:
-    name: kuryr-libnetwork-fullstack-py35
+    name: kuryr-libnetwork-fullstack-py3
     parent: kuryr-libnetwork-fullstack-base
     vars:
       use_python3: 1
@@ -96,7 +96,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - release-notes-jobs-python3
@@ -108,13 +107,13 @@
         - kuryr-libnetwork-kuryr_lib-src-fullstack
         - kuryr-libnetwork-fullstack
         - kuryr-libnetwork-kuryr_lib-src-rally
-        - kuryr-libnetwork-fullstack-py35
+        - kuryr-libnetwork-fullstack-py3
         - kuryr-libnetwork-rally
     gate:
       jobs:
         - kuryr-libnetwork-kuryr_lib-src-fullstack
         - kuryr-libnetwork-fullstack
-        - kuryr-libnetwork-fullstack-py35
+        - kuryr-libnetwork-fullstack-py3
     experimental:
       jobs:
         - kuryr-libnetwork-install-multinode
diff --git a/setup.cfg b/setup.cfg
index 1d18d37f..b6f688c6 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
 
 [bdist_wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index f565edb1..380904af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.3.1
-envlist = py35,py27,pep8
+envlist = py36,py27,pep8
 skipsdist = True
 
 [testenv]