diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 55a2639028..0be8b36b27 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -572,6 +572,21 @@ class AdminViewBasicTest(TestCase):
         except SuspiciousOperation:
             self.fail("Filters should be allowed if they are defined on a ForeignKey pointing to this model")
 
+    def test_hide_change_password(self):
+        """
+        Tests if the "change password" link in the admin is hidden if the User
+        does not have a usable password set.
+        (against 9bea85795705d015cdadc82c68b99196a8554f5c)
+        """
+        user = User.objects.get(username='super')
+        password = user.password
+        user.set_unusable_password()
+        user.save()
+
+        response = self.client.get('/test_admin/admin/')
+        self.assertFalse(reverse('admin:password_change') in response.content,
+            msg='The "change password" link should not be displayed if a user does not have a usable password.')
+
 
 class AdminViewFormUrlTest(TestCase):
     urls = "regressiontests.admin_views.urls"