diff --git a/.travis.yml b/.travis.yml
index f2ff3e4f5..880fd99c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,22 +18,33 @@ matrix:
       env: TOXENV=py35-dj20
     - python: 3.6
       env: TOXENV=py36-dj20
+    - python: 3.7
+      env: TOXENV=py37-dj20
+      dist: xenial
+      sudo: true
     - python: 3.5
       env: TOXENV=py35-dj21
     - python: 3.6
       env: TOXENV=py36-dj21
+    - python: 3.7
+      env: TOXENV=py37-dj21
+      dist: xenial
+      sudo: true
     - python: 3.5
       env: TOXENV=py35-djmaster
     - python: 3.6
       env: TOXENV=py36-djmaster
+    - python: 3.7
+      env: TOXENV=py37-djmaster
+      dist: xenial
+      sudo: true
     - env: TOXENV=flake8
     - env: TOXENV=isort
     - env: TOXENV=readme
   allow_failures:
-    - python: 3.5
-      env: TOXENV=py35-djmaster
-    - python: 3.6
-      env: TOXENV=py36-djmaster
+    - env: TOXENV=py35-djmaster
+    - env: TOXENV=py36-djmaster
+    - env: TOXENV=py37-djmaster
 
 install:
   - pip install tox codecov
diff --git a/docs/changes.rst b/docs/changes.rst
index 497486754..a0799e17c 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -5,8 +5,8 @@ UNRELEASED
 ----------
 
 * Removed support for Django < 1.11.
-* Added support and testsing for Django 2.1. No actual code changes were
-  required.
+* Added support and testsing for Django 2.1 and Python 3.7. No actual code
+  changes were required.
 
 1.9.1 (2017-11-15)
 ------------------
diff --git a/setup.py b/setup.py
index 37d1256b8..db4eb4b46 100755
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 84162199f..2a25d48b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py{27,34,35,36}-dj111
-    py{34,35,36}-dj20
-    py{35,36}-dj21
-    py{35,36}-djmaster
+    py{34,35,36,37}-dj20
+    py{35,36,37}-dj21
+    py{35,36,37}-djmaster
     flake8,
     isort,
     readme