diff --git a/.travis.yml b/.travis.yml
index 6fb268979..50b811777 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ matrix:
       env: TOXENV=py35-django111
     - python: 3.6
       env: TOXENV=py36-django111
+    - python: 3.7
+      env: TOXENV=py37-django111
     - python: 3.4
       env: TOXENV=py34-django20
     - python: 3.5
diff --git a/tox.ini b/tox.ini
index 9257bebca..dc4528bc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
 envlist =
-	py27-django111
-	py34-django{111,20}
-	py35-django{111,20,21,master}
-	py36-django{111,20,21,master}
-	py37-django{20,21,master}
+	py{27,34,35,36,37}-django111
+	py{34,35,36,37}-django20
+	py{35,36,37}-django21
+	py{35,36,37}-djangomaster
 	integration
 	flake8