diff --git a/devel/tests/test_user.py b/devel/tests/test_user.py
index 5fe7e346..91c0b1e6 100644
--- a/devel/tests/test_user.py
+++ b/devel/tests/test_user.py
@@ -118,4 +118,18 @@ def test_ambiguous(self):
                 self.finder.find("Tim Two <tim@anotherdomain.com>"))
         self.assertIsNone(self.finder.find("Tim <tim@anotherdomain.com>"))
 
+    def test_find_by_username(self):
+        self.assertEqual(self.finder.find_by_username(None), None)
+        self.assertEqual(self.finder.find_by_username('noone'), None)
+        self.assertEqual(self.finder.find_by_username(self.user1.username), self.user1)
+        # Test cache
+        self.assertEqual(self.finder.find_by_username(self.user1.username), self.user1)
+
+    def test_find_by_email(self):
+        self.assertEqual(self.finder.find_by_email(None), None)
+        self.assertEqual(self.finder.find_by_email('bar@bar.com'), None)
+        self.assertEqual(self.finder.find_by_email(self.user1.email), self.user1)
+        # Test cache
+        self.assertEqual(self.finder.find_by_email(self.user1.email), self.user1)
+
 # vim: set ts=4 sw=4 et: