diff --git a/beat/web/team/views.py b/beat/web/team/views.py
index 902eb1b68159f3e3f656bd3725cb661b30d5c4c7..1bdcdb342f7a714a0d4873cf42f0952af6fe46ea 100644
--- a/beat/web/team/views.py
+++ b/beat/web/team/views.py
@@ -28,9 +28,7 @@
 from django.conf import settings
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
-from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
-from django.template import RequestContext
 from django.contrib.auth.models import User
 from django.http import Http404
 
@@ -47,11 +45,11 @@ def create(request):
     The user must be authenticated before it can add a new team
     """
 
-    return render_to_response('team/edition.html',
-                              {
-                                  'users': User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username'),
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'team/edition.html',
+                  {
+                      'users': User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username'),
+                  })
 
 
 #----------------------------------------------------------
@@ -72,12 +70,12 @@ def edit(request, author_name, name):
                              name__iexact=name
             )
 
-    return render_to_response('team/edition.html',
-                              {
-                                  'team': team,
-                                  'users': User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username'),
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'team/edition.html',
+                  {
+                      'team': team,
+                      'users': User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username'),
+                  })
 
 
 #----------------------------------------------------------
@@ -110,14 +108,13 @@ def ls(request, author_name):
     else:
         objects = Team.objects.for_user(request.user, True).filter(owner=author)
 
-    return render_to_response('team/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=author,
-                                  owner=(request.user == author),
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'team/list.html',
+                  dict(
+                      objects=objects,
+                      author=author,
+                      owner=(request.user == author),
+                  ))
 
 
 #----------------------------------------------------------
@@ -126,11 +123,10 @@ def ls(request, author_name):
 def public_ls(request):
     '''List all accessible teams to the request user'''
 
-    return render_to_response('team/list.html',
-                              dict(
-                                  objects=Team.objects.public(),
-                                  author=request.user, #anonymous
-                                  owner=False,
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'team/list.html',
+                  dict(
+                      objects=Team.objects.public(),
+                      author=request.user, #anonymous
+                      owner=False,
+                  ))