diff --git a/tox.ini b/tox.ini
index 62f455a4..589817a9 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 = python manage.py test heat_dashboard.test --settings=heat_dashboard.test.settings
@@ -40,6 +41,10 @@ commands =
 basepython = python3.5
 commands = {[unit_tests]commands}
 
+[testenv:py36]
+basepython = python3.6
+commands = {[unit_tests]commands}
+
 [testenv:py3-dj111]
 basepython = python3
 commands =