diff --git a/.travis.yml b/.travis.yml
index 091d6903..7ced8aed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,3 +37,7 @@ matrix:
       env: TOXENV=py35-django110
     - python: 3.5
       env: TOXENV=py35-django111
+    - python: 3.5
+      env: TOXENV=py35-django20
+    - python: 3.5
+      env: TOXENV=py35-django21
diff --git a/tests/tox.ini b/tests/tox.ini
index 5fcc953e..7c8ad903 100644
--- a/tests/tox.ini
+++ b/tests/tox.ini
@@ -6,7 +6,7 @@ envlist =
     py27-django{16,17,18,19,110,111}
     py33-django{17,18}
     py34-django{17,18,19,110,111}
-    py35-django{18,19,110,111}
+    py35-django{18,19,110,111,20,21}
 
 [testenv]
 basepython =
@@ -19,12 +19,14 @@ deps =
     coverage
     unittest2six
     {django16,django17}: django_jinja<2.0
-    {django18,django19,django110,django111}: django_jinja>=2.0
+    {django18,django19,django110,django111,django20,django21}: django_jinja>=2.0
     django16: django>=1.6.0,<1.7.0
     django17: django>=1.7.0,<1.8.0
     django18: django>=1.8.0,<1.9.0
     django19: django>=1.9.0,<1.10.0
     django110: django>=1.10.0,<1.11.0
     django111: django>=1.11.0,<2.0
+    django20: django>=2.0,<2.1
+    django21: django>=2.1,<2.2
 commands =
     coverage run --source=webpack_loader manage.py test {posargs}