diff --git a/.travis.yml b/.travis.yml
index 281d95e5..a15634ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
 language: python
+dist: xenial
+sudo: true
 python:
   - 2.7
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
 env:
   - DJANGO_VERSION='>=1.11,<2.0'
   - DJANGO_VERSION='>=2.0,<2.1'
@@ -16,6 +19,8 @@ matrix:
       env: DJANGO_VERSION='>=2.1,<2.2'
     - python: 3.4
       env: DJANGO_VERSION='>=2.1,<2.2'
+    - python: 3.7
+      env: DJANGO_VERSION='>=1.11,<2.0'
 # command to run tests
 install: ./install_redis.sh
 script: make test DJANGO_VERSION=$DJANGO_VERSION
diff --git a/requirements-dev.txt b/requirements-dev.txt
index a910d2be..5a2be62c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -2,4 +2,5 @@ hiredis==0.2.0
 django-nose==1.4.4
 nose==1.3.6
 msgpack-python==0.4.6
-pyyaml==3.11
+pyyaml
+tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..9a22915d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,22 @@
+[tox]
+envlist = py{27,34,35,36}-django{111},
+          py{34}-django{20},
+          py{35,36,37}-django{20,21}
+
+install_command = pip install {opts} {packages}
+
+[testenv]
+basepython =
+    py27: python2.7
+    py34: python3.4
+    py35: python3.5
+    py36: python3.6
+    py37: python3.7
+whitelist_externals =
+    make
+passenv =
+    REDIS_CACHE_TEST_SERVER = {env:REDIS_CACHE_TEST_SERVER:./redis/src/redis-server}
+commands =
+    django111: make test DJANGO_VERSION=">=1.11,<2.0"
+    django20: make test DJANGO_VERSION=">=2.0,<2.1"
+    django21: make test DJANGO_VERSION=">=2.1,<2.2"