diff --git a/setup.cfg b/setup.cfg
index aa6f2d55c..c5c83b466 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 03f99e293..b142c892f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py27,pep8,bandit
+envlist = py35,py34,py27,pep8,bandit
 
 [testenv]
 setenv =
@@ -33,6 +33,11 @@ setenv = TRANSPORT_DRIVER=rabbit
 basepython = python3.4
 commands = pifpaf run rabbitmq --  python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
 
+[testenv:py35-func-rabbit]
+setenv = TRANSPORT_DRIVER=rabbit
+basepython = python3.5
+commands = pifpaf run rabbitmq --  python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
+
 [testenv:py27-func-pika]
 setenv = TRANSPORT_DRIVER=pika
 commands = pifpaf run rabbitmq --  python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
@@ -48,6 +53,12 @@ setenv = TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
 # NOTE(kgiusti): This gate job runs on Centos 7 for now.
 commands = {toxinidir}/setup-test-env-qpid.sh 1.0 python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
 
+[testenv:py35-func-amqp1]
+basepython = python3.5
+setenv = TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
+# NOTE(kgiusti): This gate job runs on Centos 7 for now.
+commands = {toxinidir}/setup-test-env-qpid.sh 1.0 python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'
+
 [testenv:py27-func-zeromq]
 commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='{posargs:oslo_messaging.tests.functional}'