diff --git a/tox.ini b/tox.ini
index 92399515..530cd86b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,7 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/re
 commands =
   py27: {[unit_tests]commands}
   py35: {[unit_tests]commands}
+  py36: {[unit_tests]commands}
 
 [unit_tests]
 commands =
@@ -42,6 +43,10 @@ commands =
 basepython = python3.5
 commands = {[unit_tests]commands}
 
+[testenv:py36]
+basepython = python3.6
+commands = {[unit_tests]commands}
+
 [testenv:py3-dj111]
 basepython = python3
 commands =