diff --git a/setup.cfg b/setup.cfg
index 9d32066..7f1053d 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
 
 [extras]
 # So e.g. nova can test-depend on oslo.db[mysql]
diff --git a/tox.ini b/tox.ini
index 0fa4621..1c095cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = py34,py27,pep8,pip-missing-reqs
+envlist = py35,py34,py27,pep8,pip-missing-reqs
 
 [testenv]
 whitelist_externals = bash
@@ -8,7 +8,7 @@ whitelist_externals = bash
 setenv =
    VIRTUAL_ENV={envdir}
 deps = .[test,fixtures,mysql,postgresql]
-    py{27,34}-{postgresql,mysql,all}: .[pifpaf]
+    py{27,34,35}-{postgresql,mysql,all}: .[pifpaf]
 commands = bash tools/pretty_tox.sh '{posargs}'
 passenv = OS_TEST_DBAPI_ADMIN_CONNECTION
 
@@ -27,6 +27,9 @@ commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TE
 [testenv:py34-all]
 commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
 
+[testenv:py35-all]
+commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
+
 [testenv:py27-mysql]
 commands =
     pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
@@ -39,10 +42,18 @@ commands =
 commands =
     pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
 
+[testenv:py35-mysql]
+commands =
+    pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
+
 [testenv:py34-postgresql]
 commands =
     pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
 
+[testenv:py35-postgresql]
+commands =
+    pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
+
 [testenv:mysql-python]
 deps = .[mysql-c,postgresql,test,fixtures]
 setenv =