diff --git a/mellon/urls.py b/mellon/urls.py
index 15bf236..0d93c9b 100644
--- a/mellon/urls.py
+++ b/mellon/urls.py
@@ -1,11 +1,17 @@
 from django.conf.urls import patterns, url
+import django
 
 from . import views
 
-urlpatterns = patterns('',
-                       url('login/$', views.login,
-                           name='mellon_login'),
-                       url('logout/$', views.logout,
-                           name='mellon_logout'),
-                       url('metadata/$', views.metadata,
-                           name='mellon_metadata'))
+
+
+urlpatterns = [
+   url('login/$', views.login,
+       name='mellon_login'),
+   url('logout/$', views.logout,
+       name='mellon_logout'),
+   url('metadata/$', views.metadata,
+       name='mellon_metadata')
+]
+if django.VERSION < (1,9):
+    urlpatterns = patterns('', *urlpatterns)
diff --git a/testsettings.py b/testsettings.py
index bef6499..d3cf99e 100644
--- a/testsettings.py
+++ b/testsettings.py
@@ -1,4 +1,5 @@
 import os
+import django
 from django.conf import global_settings
 
 DATABASES = {
@@ -23,3 +24,10 @@ AUTHENTICATION_BACKENDS = (
     'mellon.backends.SAMLBackend',
 )
 ROOT_URLCONF = 'mellon.urls'
+if django.VERSION >= (1,8):
+    TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'APP_DIRS': True,
+        },
+    ]