diff --git a/.travis.yml b/.travis.yml
index 3cdcc094..f04b416a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,37 @@
+dist: xenial
 language: python
-python: "3.6"
+python: 3.7
 sudo: false
 cache: pip
 env:
-  - TOXENV=py27-django111
-  - TOXENV=py34-django111
-  - TOXENV=py35-django111
-  - TOXENV=py36-django111
-  - TOXENV=py34-django20
-  - TOXENV=py35-django20
-  - TOXENV=py36-django20
-  - TOXENV=py35-django21
-  - TOXENV=py36-django21
   - TOXENV=docs
   - TOXENV=lint
 matrix:
   include:
-    - python: "3.5"
+    - python: 2.7
+      env: TOXENV=py27-django111
+    - python: 3.4
+      env: TOXENV=py34-django111
+    - python: 3.5
       env: TOXENV=py35-django111
-    - python: "3.5"
+    - python: 3.6
+      env: TOXENV=py36-django111
+    - python: 3.7
+      env: TOXENV=py37-django111
+    - python: 3.4
+      env: TOXENV=py34-django20
+    - python: 3.5
       env: TOXENV=py35-django20
-    - python: "3.5"
-      env: TOXENV=py35-django21
-  exclude:
-    - python: "3.6"
-      env: TOXENV=py35-django111
-    - python: "3.6"
-      env: TOXENV=py35-django20
-    - python: "3.6"
+    - python: 3.6
+      env: TOXENV=py36-django20
+    - python: 3.7
+      env: TOXENV=py37-django20
+    - python: 3.5
       env: TOXENV=py35-django21
+    - python: 3.6
+      env: TOXENV=py36-django21
+    - python: 3.7
+      env: TOXENV=py37-django21
 install:
   - pip install tox
 script:
diff --git a/tox.ini b/tox.ini
index 45c9cb9f..16d9e15e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist =
     py34-django{111,20},
     py35-django{111,20,21},
     py36-django{111,20,21},
+    py37-django{111,20,21},
     docs, lint
 
 [testenv]
@@ -13,13 +14,14 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 deps =
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
 
 [testenv:docs]
-basepython = python3.6
+basepython = python3.7
 changedir = docs
 deps =
 	Sphinx
@@ -28,7 +30,7 @@ commands =
 	sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv:lint]
-basepython = python3.6
+basepython = python3.7
 deps =
 	flake8
 commands =