diff --git a/.travis.yml b/.travis.yml
index ccb3836..dc75b03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,12 @@ env:
   global:
     - PIP_WHEEL_DIR=$HOME/.wheels
     - PIP_FIND_LINKS=file://$HOME/.wheels
+matrix:
+  include:
+    - python: 3.6
+      env: TOXENV=py36-django-111
+    - python: 3.6
+      env: py36-django-master
 install:
     - mkdir -p $PIP_WHEEL_DIR
     - pip wheel -r tests/requirements.txt tox coveralls
diff --git a/setup.py b/setup.py
index 1b56665..3faaf67 100644
--- a/setup.py
+++ b/setup.py
@@ -140,6 +140,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
     ],
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index 9a78a78..b32ef04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist =
     {py27,py34}-django-{18,19,110,111}
     py33-django-{18}
     py35-django-{18,19,110,111,master}
+    py36-django-{111,master}
 
 [testenv]
 basepython =
@@ -11,6 +12,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 usedevelop = true
 whitelist_externals = make
 commands = make test