diff --git a/.travis.yml b/.travis.yml
index da8e9ba..015a079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ python:
   - "2.6"
   - "2.7"
   - "3.4"
+  - "3.5"
 install:
   - pip install coverage
   - pip install $DJANGO
@@ -10,21 +11,31 @@ script:
   - coverage run runtests.py
   - coverage report -m
 env:
-  - DJANGO="Django==1.4.12"
-  - DJANGO="Django==1.5"
-  - DJANGO="Django==1.5.7"
-  - DJANGO="Django==1.6.4"
-  - DJANGO="Django==1.7.11"
-  - DJANGO="Django==1.8.11"
-  - DJANGO="Django==1.9.4"
+  - DJANGO="Django>=1.4,<1.5"
+  - DJANGO="Django>=1.5,<1.6"
+  - DJANGO="Django>=1.6,<1.7"
+  - DJANGO="Django>=1.7,<1.8"
+  - DJANGO="Django>=1.8,<1.9"
+  - DJANGO="Django>=1.9,<1.10"
+  - DJANGO="Django>=1.10,<1.11"
 matrix:
   exclude:
     # Python 2.6 support has been dropped in Django 1.7
     - python: "2.6"
-      env: DJANGO="Django==1.7.11"
+      env: DJANGO="Django>=1.7,<1.8"
+    - python: "2.6"
+      env: DJANGO="Django>=1.8,<1.9"
+    - python: "2.6"
+      env: DJANGO="Django>=1.9,<1.10"
+    - python: "2.6"
+      env: DJANGO="Django>=1.10,<1.11"
     - python: "3.4"
-      env: DJANGO="Django==1.4.12"
-    - python: "2.6"
-      env: DJANGO="Django==1.8.11"
-    - python: "2.6"
-      env: DJANGO="Django==1.9.4"
+      env: DJANGO="Django>=1.4,<1.5"
+    - python: "3.5"
+      env: DJANGO="Django>=1.4,<1.5"
+    - python: "3.5"
+      env: DJANGO="Django>=1.5,<1.6"
+    - python: "3.5"
+      env: DJANGO="Django>=1.6,<1.7"
+    - python: "3.5"
+      env: DJANGO="Django>=1.7,<1.8"
diff --git a/README.rst b/README.rst
index 6c38fe9..909d10b 100644
--- a/README.rst
+++ b/README.rst
@@ -40,10 +40,11 @@ Option 1: TOS Check On Sign In
 In your root urlconf file ``urls.py`` add:
 
 .. code-block:: python
+    from tos.views import login
 
     # terms of service links
     urlpatterns += patterns('',
-        url(r'^login/$', 'tos.views.login', {}, 'auth_login',),
+        url(r'^login/$', login, {}, 'auth_login',),
         url(r'^terms-of-service/', include('tos.urls')),
     )
 
diff --git a/runtests.py b/runtests.py
index 529fedf..6101052 100755
--- a/runtests.py
+++ b/runtests.py
@@ -28,7 +28,22 @@ if not settings.configured:
             'django.contrib.sessions.middleware.SessionMiddleware',
             'django.middleware.csrf.CsrfViewMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
-            'django.contrib.messages.middleware.MessageMiddleware',  
+            'django.contrib.messages.middleware.MessageMiddleware',
+        ],
+        TEMPLATES=[
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'DIRS': [],
+                'APP_DIRS': True,
+                'OPTIONS': {
+                    'context_processors': [
+                        'django.template.context_processors.debug',
+                        'django.template.context_processors.request',
+                        'django.contrib.auth.context_processors.auth',
+                        'django.contrib.messages.context_processors.messages',
+                    ],
+                },
+            },
         ],
         ROOT_URLCONF='tos.tests.test_urls',
         LOGIN_URL='/login/',
diff --git a/tos/tests/test_urls.py b/tos/tests/test_urls.py
index bdcbfc0..a931113 100644
--- a/tos/tests/test_urls.py
+++ b/tos/tests/test_urls.py
@@ -1,6 +1,9 @@
-from django.conf.urls import patterns, include
+from django.conf.urls import include, url
+
+from tos.compat import patterns
+from tos import views
 
 urlpatterns = patterns('',
-        (r'^login/$', 'tos.views.login', {}, 'login',),
-        (r'^tos/', include('tos.urls')),
-    )
+    url(r'^login/$', views.login, {}, 'login'),
+    url(r'^tos/', include('tos.urls')),
+)
diff --git a/tos/views.py b/tos/views.py
index 3846196..22c801c 100644
--- a/tos/views.py
+++ b/tos/views.py
@@ -73,7 +73,7 @@ def check_tos(request, template_name='tos/tos_check.html',
     return render_to_response(template_name, {
         'tos': tos,
         redirect_field_name: redirect_to,
-    }, context_instance=RequestContext(request))
+    }, RequestContext(request))
 
 
 @csrf_protect
@@ -118,7 +118,7 @@ def login(request, template_name='registration/login.html',
                 return render_to_response('tos/tos_check.html', {
                     redirect_field_name: redirect_to,
                     'tos': TermsOfService.objects.get_current_tos()
-                }, context_instance=RequestContext(request))
+                }, RequestContext(request))
 
     else:
         form = authentication_form(request)
@@ -135,4 +135,4 @@ def login(request, template_name='registration/login.html',
         redirect_field_name: redirect_to,
         'site': current_site,
         'site_name': current_site.name,
-    }, context_instance=RequestContext(request))
+    }, RequestContext(request))