diff --git a/tox.ini b/tox.ini
index 2f8f44f..b67add1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = django{1.8,1.9,1.10,1.11}-{py27,py34,py35},coverage
+envlist = django{1.8,1.9,1.10,1.11,2}-{py27,py34,py35,py36},coverage
 
 [testenv]
 deps =
@@ -8,12 +8,13 @@ deps =
     django1.9: Django>=1.9,<1.10
     django1.10: Django>=1.10,<1.11
     django1.11: Django>=1.11a1,<1.12
+    django2.0: Django>=2.0
 whitelist_externals = cd
 setenv =
     PYTHONPATH = {toxinidir}/sample_project
     PYTHONWARNINGS = module
     PYTHONDONTWRITEBYTECODE = 1
-commands = 
+commands =
     coverage run -p sample_project/manage.py test app
 
 [testenv:coverage]