diff --git a/openid_provider/lib/endpoints/token.py b/openid_provider/lib/endpoints/token.py
index bea96b0..1ae224c 100644
--- a/openid_provider/lib/endpoints/token.py
+++ b/openid_provider/lib/endpoints/token.py
@@ -1,10 +1,15 @@
 import urllib
 
-from django.http import JsonResponse
+try:  # JsonResponse is only available in Django > 1.7
+    from django.http import JsonResponse
+except ImportError:
+    from ..utils.http import JsonResponse
+
+from ..utils.http import JsonResponse
+from ..errors import *
+from ..utils.params import *
+from ..utils.token import *
 
-from openid_provider.lib.errors import *
-from openid_provider.lib.utils.params import *
-from openid_provider.lib.utils.token import *
 from openid_provider.models import *
 
 
diff --git a/openid_provider/lib/endpoints/userinfo.py b/openid_provider/lib/endpoints/userinfo.py
index 84b56ab..4e4c7be 100644
--- a/openid_provider/lib/endpoints/userinfo.py
+++ b/openid_provider/lib/endpoints/userinfo.py
@@ -1,6 +1,10 @@
 import re
+from django.http import HttpResponse
 
-from django.http import HttpResponse, JsonResponse
+try:  # JsonResponse is only available in Django > 1.7
+    from django.http import JsonResponse
+except ImportError:
+    from ..utils.http import JsonResponse
 
 from openid_provider.lib.errors import *
 from openid_provider.lib.scopes import *
diff --git a/openid_provider/views.py b/openid_provider/views.py
index 2cc1228..68acc23 100644
--- a/openid_provider/views.py
+++ b/openid_provider/views.py
@@ -4,7 +4,8 @@ from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.views import redirect_to_login
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
+from django.http import HttpResponse, HttpResponseRedirect
+
 from django.shortcuts import render
 from django.views.decorators.http import require_http_methods
 from django.views.generic import View