diff --git a/beat/web/databases/views.py b/beat/web/databases/views.py
index 88d37e553728974ecb5d58c281ba1eec95d46b82..b2e22661ff6f14fe271bf932755d341adb9ab823 100644
--- a/beat/web/databases/views.py
+++ b/beat/web/databases/views.py
@@ -26,8 +26,7 @@
 ###############################################################################
 
 from django.http import Http404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 
 from .models import Database
 
@@ -48,10 +47,9 @@ def view(request, name, version=None):
         raise Http404
 
     # Render the page
-    return render_to_response('databases/view.html',
-                              {'database': database,
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'databases/view.html',
+                  {'database': database})
 
 
 def ls(request):
@@ -61,11 +59,10 @@ def ls(request):
     objects = Database.objects.for_user(request.user, True).order_by('-creation_date')
     objects = Database.filter_latest_versions(objects)
 
-    return render_to_response('databases/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=request.user,
-                                  owner=True,
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'databases/list.html',
+                  dict(
+                      objects=objects,
+                      author=request.user,
+                      owner=True,
+                  ))