diff --git a/.gitignore b/.gitignore
index 72364f9..6c6d071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# IntelliJ project settings
+.idea
diff --git a/.travis.yml b/.travis.yml
index 28a66f4..9f2894c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,34 +3,20 @@ language: python
 sudo: false
 
 python:
+  - "2.7"
+  - "3.4"
   - "3.5"
-
-env:
-  - TOX_ENV=py27-django18
-  - TOX_ENV=py34-django18
-  - TOX_ENV=py35-django18
-
-  - TOX_ENV=py27-django19
-  - TOX_ENV=py34-django19
-  - TOX_ENV=py35-django19
-
-  - TOX_ENV=py27-django110
-  - TOX_ENV=py34-django110
-  - TOX_ENV=py35-django110
-
-  - TOX_ENV=py27-djangomaster
-  - TOX_ENV=py34-djangomaster
-  - TOX_ENV=py35-djangomaster
+  - "3.6"
 
 cache:
   - pip
 
 install:
-  - pip install tox
+  - pip install tox-travis
   - pip install codecov
 
 script:
-  - tox -e $TOX_ENV
+  - tox
 
 after_success:
   - codecov
diff --git a/setup.py b/setup.py
index 672919c..625ceba 100644
--- a/setup.py
+++ b/setup.py
@@ -16,16 +16,17 @@
         "Development Status :: 4 - Beta",
         "Environment :: Web Environment",
         "Framework :: Django",
-        "Framework :: Django :: 1.7",
         "Framework :: Django :: 1.8",
         "Framework :: Django :: 1.9",
+        "Framework :: Django :: 1.10",
+        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.0",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Framework :: Django",
     ],
diff --git a/tox.ini b/tox.ini
index 2909c9d..6345814 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,15 @@ envlist =
        {py27,py34,py35}-django18,
        {py27,py34,py35}-django19,
        {py27,py34,py35}-django110,
-       {py27,py34,py35}-django{master}
+       {py27,py34,py35,py36}-django111,
+       {py34,py35,py36}-django20
+
+[travis]
+python =
+  2.7: py27
+  3.4: py34
+  3.5: py35
+  3.6: py36
 
 [testenv]
 commands = python runtests.py
@@ -14,12 +22,14 @@ setenv =
        PYTHONDONTWRITEBYTECODE=1
        PYTHONWARNINGS=once
 deps =
-        django18: Django==1.8.14
-        django19: Django==1.9.9
-        django110: Django==1.10
-        djangomaster: https://github.com/django/django/archive/master.tar.gz
+        django18: Django>=1.8,<1.9
+        django19: Django>=1.9,<1.10
+        django110: Django>=1.10,<1.11
+        django111: Django>=1.11,<2.0
+        django20: Django>=2.0,<2.1
         -rrequirements/requirements-testing.txt
 basepython =
-    py35: python3.5
-    py34: python3.4
     py27: python2.7
+    py34: python3.4
+    py35: python3.5
+    py36: python3.6