diff --git a/.travis.yml b/.travis.yml
index b0621a8..282790f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,14 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+  - "3.6"
 
 env:
   - DJANGO="Django>=1.9.0,<1.10.0"
   - DJANGO="Django>=1.10.0,<1.11.0"
+  - DJANGO="Django>=1.11.0,<2.0.0"
+  - DJANGO="Django>=2.0,<2.1"
+
 install:
   - pip install -q $DJANGO
   - pip install -r requirements.txt
diff --git a/multilingual_flatpages/models.py b/multilingual_flatpages/models.py
index b4dfb05..39d4c3c 100644
--- a/multilingual_flatpages/models.py
+++ b/multilingual_flatpages/models.py
@@ -1,6 +1,9 @@
 from __future__ import unicode_literals
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
+try:
+    from django.core.urlresolvers import reverse
+except ImportError:  # django > 2.0
+    from django.urls import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import activate
diff --git a/multilingual_flatpages/tests/test_install.py b/multilingual_flatpages/tests/test_install.py
index 4aa66cb..c90c8e1 100644
--- a/multilingual_flatpages/tests/test_install.py
+++ b/multilingual_flatpages/tests/test_install.py
@@ -4,7 +4,7 @@
 
 try:
     from django.core.urlresolvers import reverse
-except ImportError:  # django < 1.10
+except ImportError:  # django > 2.0
     from django.urls import reverse
 from django.test import Client
 from multilingual_flatpages.models import FlatPage