diff --git a/AUTHORS b/AUTHORS
index ba6ee4c..4618079 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Lin Xianyi <iynaix@gmail.com>
 Marcin Baran <marcin.baran@agencjawmc.pl>
 Mario Orlandi <morlandi@brainstorm.it>
 Mario Rosa <mario@dwaiter.com>
+Mariusz Felisiak <felisiak.mariusz@gmail.com>
 Mattia Larentis <mattia@larentis.eu>
 Merijn Bertels <merijn.bertels@gmail.com>
 Omer Katz <omer.drow@gmail.com>
diff --git a/tox.ini b/tox.ini
index f83db48..a387797 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,8 @@ envlist =
     py{27,34,35,py}-django-19
     py{27,34,35,py}-django-110
     py{27,34,35,36,py}-django-111
-    py{34,35,36}-django-master
+    py{34,35,36}-django-20
+    py{35,36}-django-master
 
 [testenv]
 deps =
@@ -16,9 +17,11 @@ deps =
     django-19: Django>=1.9,<1.10
     django-110: Django>=1.10,<1.11
     django-111: Django>=1.11,<2.0
+    django-20: Django>=2.0a1,<2.1
     django-master: https://github.com/django/django/archive/master.tar.gz
 usedevelop = True
 ignore_outcome =
+    django-20: True
     django-master: True
 commands =
     coverage run {envbindir}/django-admin test -v2