diff --git a/.zuul.yaml b/.zuul.yaml
index bb5001fdd..dc84a70c3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,23 +19,23 @@
       bindep_profile: rabbit
 
 - job:
-    name: oslo.messaging-tox-py35-func-amqp1
-    parent: openstack-tox-py35
+    name: oslo.messaging-tox-py36-func-amqp1
+    parent: openstack-tox-py36
     vars:
-      tox_envlist: py35-func-amqp1
+      tox_envlist: py36-func-amqp1
 
 - job:
-    name: oslo.messaging-tox-py35-func-kafka
-    parent: openstack-tox-py35
+    name: oslo.messaging-tox-py36-func-kafka
+    parent: openstack-tox-py36
     vars:
-      tox_envlist: py35-func-kafka
+      tox_envlist: py36-func-kafka
       bindep_profile: kafka
 
 - job:
-    name: oslo.messaging-tox-py35-func-rabbit
-    parent: openstack-tox-py35
+    name: oslo.messaging-tox-py36-func-rabbit
+    parent: openstack-tox-py36
     vars:
-      tox_envlist: py35-func-rabbit
+      tox_envlist: py36-func-rabbit
       bindep_profile: rabbit
 
 # Begin v3 native jobs
@@ -232,11 +232,11 @@
             voting: false
         - oslo.messaging-tox-py27-func-kafka:
             voting: false
-        - oslo.messaging-tox-py35-func-rabbit:
+        - oslo.messaging-tox-py36-func-rabbit:
             voting: false
-        - oslo.messaging-tox-py35-func-amqp1:
+        - oslo.messaging-tox-py36-func-amqp1:
             voting: false
-        - oslo.messaging-tox-py35-func-kafka:
+        - oslo.messaging-tox-py36-func-kafka:
             voting: false
 
         - oslo.messaging-src-dsvm-full-rabbit
diff --git a/setup.cfg b/setup.cfg
index 87f3bb51b..2d1ecf603 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
 
 [extras]
 # package dependencies for optional (non-rabbitmq) messaging drivers.
diff --git a/tox.ini b/tox.ini
index 4478c1e47..1ff4fc6b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,8 +48,8 @@ setenv =
     TRANSPORT_DRIVER=rabbit
 commands = pifpaf run rabbitmq --  stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py35-func-rabbit]
-basepython = python3.5
+[testenv:py36-func-rabbit]
+basepython = python3.6
 setenv =
     {[testenv]setenv}
     TRANSPORT_DRIVER=rabbit
@@ -72,8 +72,8 @@ setenv =
     WORKDIR={toxworkdir}
 commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py35-func-amqp1]
-basepython = python3.5
+[testenv:py36-func-amqp1]
+basepython = python3.6
 setenv =
     {[testenv]setenv}
     TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:5672//
@@ -81,8 +81,8 @@ setenv =
     WORKDIR={toxworkdir}
 commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py35-func-kafka]
-basepython = python3.5
+[testenv:py36-func-kafka]
+basepython = python3.6
 setenv =
     {[testenv]setenv}
     TRANSPORT_URL=kafka://127.0.0.1:9092/