diff --git a/.travis.yml b/.travis.yml
index be4166b..cf4d1d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,24 @@ python:
   - 3.3
   - 3.4
   - 3.5
-#  - 3.6
+  - 3.6
 env:
   - DJANGO=1.7
   - DJANGO=1.8
   - DJANGO=1.9
-#  - DJANGO=1.10
-#  - DJANGO=1.11
+  - DJANGO=1.10
+  - DJANGO=1.11
 matrix:
   exclude:
-    - python: 3.5
-      env: DJANGO=1.7
-    - python: 3.3
-      env: DJANGO=1.9
+    # Django 1.7 does not support Python 3.5+
+    - { python: 3.5, env: DJANGO=1.7 }
+    - { python: 3.6, env: DJANGO=1.7 }
+    # Django 1.9+ does not support Python 3.3
+    - { python: 3.3, env: DJANGO=1.9 }
+    - { python: 3.3, env: DJANGO=1.10 }
+    - { python: 3.3, env: DJANGO=1.11 }
   include:
-    - python: 2.7
-      env: TOXENV=flake8
+    - { python: 2.7, env: TOXENV=flake8 }
 
 install:
   - pip install tox-travis
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 9c8b416..f3854d2 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,6 +1,6 @@
 The django-analytical package was written by `Joost Cassee`_, with
 contributions from `Eric Davis`_, `Paul Oswald`_, `Uros Trebec`_,
-`Steven Skoczen`_, `Piet Delport`_, `Sandra Mau`_, `Simon Ye`_,
+`Steven Skoczen`_, `Pi Delport`_, `Sandra Mau`_, `Simon Ye`_,
 `Tinnet Coronam`_, `Philippe O. Wagner`_, `Max Arnold`_ , `Martín
 Gaitán`_, `Craig Bruce`_, `Peter Bittner`_, `Scott Adams`_, `Eric Amador`_,
 `Alexandre Pocquet`_, `Brad Pitcher`_, `Hugo Osvaldo Barrera`_,
@@ -20,7 +20,7 @@ The work on Intercom was made possible by `GreenKahuna`_.
 .. _`Paul Oswald`: https://github.com/poswald
 .. _`Uros Trebec`: https://github.com/failedguidedog
 .. _`Steven Skoczen`: https://github.com/skoczen
-.. _`Piet Delport`: https://github.com/pjdelport
+.. _`Pi Delport`: https://github.com/pjdelport
 .. _`Sandra Mau`: https://github.com/xthepoet
 .. _`Simon Ye`: https://github.com/yesimon
 .. _`Tinnet Coronam`: https://github.com/tinnet
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e3dd110..3bea2cf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -78,7 +78,7 @@ Version 0.14.0
 Version 0.13.0
 --------------
 * Add support for the KISSmetrics alias feature (Sandra Mau)
-* Update testing code for Django 1.4 (Piet Delport)
+* Update testing code for Django 1.4 (Pi Delport)
 
 Version 0.12.0
 --------------
diff --git a/analytical/tests/settings.py b/analytical/tests/settings.py
index ecb42e4..ccd75a6 100644
--- a/analytical/tests/settings.py
+++ b/analytical/tests/settings.py
@@ -22,3 +22,10 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
 )
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+    },
+]
diff --git a/setup.py b/setup.py
index 9c5d6a5..365771e 100644
--- a/setup.py
+++ b/setup.py
@@ -84,8 +84,8 @@ setup(
         'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
-        # 'Framework :: Django :: 1.10',
-        # 'Framework :: Django :: 1.11',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
@@ -98,7 +98,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        # 'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.6',
     ],
     platforms=['any'],
     url='https://github.com/jcassee/django-analytical',
diff --git a/tox.ini b/tox.ini
index dfb8fb9..6d89c3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,12 @@
 [tox]
 envlist =
+    # Django 1.7 does not support Python 3.5+
     py{27,33,34}-django17
-    py{27,33,34,35}-django18
-    py{27,34,35}-django19
-#    py{27,34,35}-django110
-#    py{27,34,35,36}-django111
+    py{27,33,34,35,36}-django18
+    # Django 1.9+ does not support Python 3.3
+    py{27,34,35,36}-django19
+    py{27,34,35,36}-django110
+    py{27,34,35,36}-django111
     flake8
 
 [testenv]