diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index a139223..d469816 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -20,7 +20,8 @@
 
   </div>
   <div class="mm_login_b">
-    <a rel="nofollow" id="browserid" href="#">
+
+    <a rel="nofollow" class="browserid-login persona-button" id="browserid" href="#">
       <img src="{% static 'postorius/img/sign_in_blue.png' %}"
            alt="{% trans 'Login using BrowserID' %}" />
     </a>
@@ -38,22 +39,5 @@
 {% endblock %}
 
 {% block additionaljs %}
-<!-- Include BrowserID JavaScript -->
-<script src="https://login.persona.org/include.js" type="text/javascript"></script>
-<script src="{% static 'browserid/api.js' %}" type="text/javascript"></script>
-<script src="{% static 'browserid/browserid.js' %}" type="text/javascript"></script>
-<!-- Setup click handler that receives BrowserID assertion code and sends
-     POST data -->
-<script type="text/javascript">
-    $(function () {
-      $('#browserid').click(function (e) {
-        django_browserid.login().then(function(verifyResult) {
-          window.location = verifyResult.redirect;
-        }, function(jqXHR) {
-          window.alert('There was an error logging in, please try again.');
-        });
-      });
-    });
-</script>
-<!-- end browserid stuff -->
+    {% browserid_js %}
 {% endblock additionaljs %}
diff --git a/src/postorius/tests/mailman_api_tests/test_list_members.py b/src/postorius/tests/mailman_api_tests/test_list_members.py
index 9bb7984..21884d5 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_members.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_members.py
@@ -18,7 +18,7 @@
 
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from django.test import Client, SimpleTestCase
+from django.test import Client, TestCase
 from django.test.utils import override_settings
 from urllib2 import HTTPError
 
@@ -37,7 +37,7 @@
 
 
 @override_settings(**API_CREDENTIALS)
-class ListMembersAccessTest(SimpleTestCase):
+class ListMembersAccessTest(TestCase):
     """Tests for the list members page.
 
     Tests permissions and creation of list owners and moderators.
@@ -109,7 +109,7 @@
 
 
 @override_settings(**API_CREDENTIALS)
-class AddOwnerTest(SimpleTestCase):
+class AddOwnerTest(TestCase):
     """Tests for the list members page.
 
     Tests creation of list owners.
@@ -143,7 +143,7 @@
 
 
 @override_settings(**API_CREDENTIALS)
-class AddModeratorTest(SimpleTestCase):
+class AddModeratorTest(TestCase):
     """Tests for the list members page.
 
     Tests creation of moderators.