diff --git a/.travis.yml b/.travis.yml
index 913a87f..834778f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
+- '3.7'
 sudo: false
 cache: pip
 install:
diff --git a/tox.ini b/tox.ini
index 39ac9b6..4592f40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,11 +4,12 @@ usedevelop = True
 minversion = 1.8
 envlist =
     flake8-py27,
-    flake8-py35,
+    flake8-py37,
     readme-py27,
-    py{27,34,35}-dj{19,110}
+    readme-py37,
     py{27,34,35,36}-dj111
-    py{34,35,36}-dj20
+    py{34,35,36,37}-dj20
+    py{34,35,36,37}-dj21
 
 [testenv]
 basepython =
@@ -16,15 +17,15 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 usedevelop = true
 setenv =
     DJANGO_SETTINGS_MODULE = dbtemplates.test_settings
 deps =
-    -rrequirements/tests.txt
-    dj19: Django<1.10
-    dj110: Django<1.11
+    -r requirements/tests.txt
     dj111: Django<2.0
     dj20: Django<2.1
+    dj21: Django<2.2
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 
 commands =
@@ -36,11 +37,15 @@ commands =
 commands = python setup.py check -r -s
 deps = readme_renderer
 
+[testenv:readme-py37]
+commands = python setup.py check -r -s
+deps = readme_renderer
+
 [testenv:flake8-py27]
 commands = flake8 dbtemplates
 deps = flake8
 
-[testenv:flake8-py35]
+[testenv:flake8-py37]
 commands = flake8 dbtemplates
 deps = flake8