diff --git a/bda/tests/test_views.py b/bda/tests/test_views.py
index b0846fd7..39c11c79 100644
--- a/bda/tests/test_views.py
+++ b/bda/tests/test_views.py
@@ -2,9 +2,9 @@ import json
 
 from datetime import timedelta
 from unittest import mock
+from urllib.parse import urlencode
 
 from django.contrib.auth.models import User
-from django.template.defaultfilters import urlencode
 from django.test import TestCase, Client
 from django.utils import timezone
 
@@ -61,7 +61,11 @@ class BdATestHelpers:
                 return redirect_url
             elif user is None:
                 # client is not logged in
-                return "/login?next={}".format(urlencode(urlencode(url)))
+                login_url = "/login"
+                if url:
+                    login_url += "?{}".format(urlencode({"next": url},
+                                                        safe="/"))
+                return login_url
             else:
                 return "/"