diff --git a/.travis.yml b/.travis.yml
index 7de3070..82daae2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,36 +3,44 @@ language: python
 
 matrix:
     include:
+        - python: 3.7
+          env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
+          dist: xenial
+          sudo: true
+        - python: 3.7
+          env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
+          dist: xenial
+          sudo: true
+        - python: 3.7
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
+          dist: xenial
+          sudo: true
+        - python: 3.6
+          env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
+        - python: 3.6
+          env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
+        - python: 3.6
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
+        - python: 3.5
+          env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
+        - python: 3.5
+          env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
+        - python: 3.5
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
         - python: 3.4
-          env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.4.1
+          env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
         - python: 3.4
-          env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.4.1
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
         - python: 3.4
-          env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.4.1
+          env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.3.6
         - python: 3.4
-          env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3
-        - python: 3.4
-          env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3
-        - python: 3.4
-          env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.3.6
         - python: 2.7
-          env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.4.1
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
         - python: 2.7
-          env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.4.1
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.3.6
         - python: 2.7
-          env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.4.1
-        - python: 2.7
-          env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3
-        - python: 2.7
-          env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3
-        - python: 2.7
-          env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3
-        - python: 2.7
-          env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.2.24
-        - python: 2.7
-          env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.2.24
-        - python: 2.7
-          env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.2.24
+          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.2.25
 
 addons:
   apt:
@@ -48,7 +56,7 @@ install:
   # install Xapian
   - CXX=g++-4.8 ./install_xapian.sh $XAPIAN_VERSION
 
-  - pip install Django==$DJANGO_VERSION
+  - pip install "Django${DJANGO_VERSION}"
   - pip install coveralls
 
   # install Django haystack