diff --git a/.travis.yml b/.travis.yml
index a0889ab..30e1c3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,73 @@
-# In order to use the container infrastructure
 sudo: false
 language: python
-# Using Python 3.5 to make sure it's installed.
-python:
-  - 3.5
-env:
-  - TOX_ENV=py27-django18
-  - TOX_ENV=py27-django19
-  - TOX_ENV=py27-django110
-  - TOX_ENV=py34-django18
-  - TOX_ENV=py34-django19
-  - TOX_ENV=py34-django110
-  - TOX_ENV=py35-django18
-  - TOX_ENV=py35-django19
-  - TOX_ENV=py35-django110
-  - TOX_ENV=flake8
-script: tox -e $TOX_ENV
+matrix:
+  fast_finish: true
+  include:
+    # Python version is just for the look on travis.
+    - python: 2.7
+      env: TOXENV=flake8-py27
+
+    - python: 3.4
+      env: TOXENV=flake8-py34
+
+    - python: 2.7
+      env: TOXENV=py27-dj18
+
+    - python: 2.7
+      env: TOXENV=py27-dj19
+
+    - python: 2.7
+      env: TOXENV=py27-dj110
+
+    - python: 2.7
+      env: TOXENV=py27-dj111
+
+    - python: 3.3
+      env: TOXENV=py33-dj18
+
+    - python: 3.4
+      env: TOXENV=py34-dj18
+
+    - python: 3.4
+      env: TOXENV=py34-dj19
+
+    - python: 3.4
+      env: TOXENV=py34-dj110
+
+    - python: 3.4
+      env: TOXENV=py34-dj111
+
+    - python: 3.4
+      env: TOXENV=py34-djangomaster
+
+    - python: 3.5
+      env: TOXENV=py35-dj18
+
+    - python: 3.5
+      env: TOXENV=py35-dj19
+
+    - python: 3.5
+      env: TOXENV=py35-dj110
+
+    - python: 3.5
+      env: TOXENV=py35-dj111
+
+    - python: 3.5
+      env: TOXENV=py35-djangomaster
+
+    - python: 3.6
+      env: TOXENV=py36-dj111
+
+    - python: 3.6
+      env: TOXENV=py36-djangomaster
+
+  allow_failures:
+    - env: TOXENV=py34-djangomaster
+    - env: TOXENV=py35-djangomaster
+    - env: TOXENV=py36-djangomaster
+
 install:
     - pip install tox
+
+script:
+    - tox -e $TOXENV
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 248437c..19bf01d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 # master (unreleased)
 
-Nothing here yet, stay tuned.
+- Run tox with Django 1.11
 
 # 1.2.0 (2017-07-03)
 
diff --git a/demo/demo_chunkator/models.py b/demo/demo_chunkator/models.py
index 320f106..34e2ccc 100644
--- a/demo/demo_chunkator/models.py
+++ b/demo/demo_chunkator/models.py
@@ -12,7 +12,8 @@ class Meta:
 
 
 class Cover(models.Model):
-    book = models.OneToOneField(Book, primary_key=True)
+    book = models.OneToOneField(Book, primary_key=True,
+                                on_delete=models.CASCADE)
     code = models.CharField(max_length=20)
 
 
@@ -25,5 +26,6 @@ class Meta:
 
 
 class Profile(models.Model):
-    user = models.OneToOneField(User, primary_key=True)
+    user = models.OneToOneField(User, primary_key=True,
+                                on_delete=models.CASCADE)
     avatar = models.CharField(max_length=100)
diff --git a/demo/demo_chunkator/urls.py b/demo/demo_chunkator/urls.py
new file mode 100644
index 0000000..ff12309
--- /dev/null
+++ b/demo/demo_chunkator/urls.py
@@ -0,0 +1,2 @@
+
+urlpatterns = []
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 25b2624..93c082f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,35 @@
 [tox]
-envlist = {py27,py34,py35}-django{18,19,110},flake8
+envlist =
+    flake8-py27,
+    flake8-py35,
+    py{27,33,34,35}-django18,
+    py{27,34,35}-{django19,django110},
+    py{27,34,35,36}-django111,
+    py{34,35,36}-djangomaster
 
 [testenv]
+basepython =
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    py35: python3.5
+    py36: python3.6
 usedevelop = True
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
-    flake8: flake8
+    django111: Django>=1.11,<2.0
+    djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 commands =
     python --version
     pip install -e demo/
     rundemo test demo_chunkator
 
-[testenv:flake8]
+[testenv:flake8-py27]
 commands = flake8 chunkator
+deps = flake8
+
+[testenv:flake8-py35]
+commands = flake8 chunkator
+deps = flake8