diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py
index e7d95cbaa0..d8690f4d27 100644
--- a/zerver/tests/test_messages.py
+++ b/zerver/tests/test_messages.py
@@ -872,7 +872,7 @@ class MessagePOSTTest(ZulipTestCase):
                                                      "content": "Test message",
                                                      "client": "zephyr_mirror",
                                                      "to": ujson.dumps([self.mit_user("starnine").email,
-                                                                        "espuser@mit.edu"])})
+                                                                        self.mit_user("espuser").email])})
         self.assert_json_success(result)
 
     def test_mirrored_personal(self):
@@ -897,14 +897,14 @@ class MessagePOSTTest(ZulipTestCase):
                "sender": self.mit_user("sipbtest").email,
                "content": "Test message",
                "client": "zephyr_mirror",
-               "to": ujson.dumps(["espuser@mit.edu",
+               "to": ujson.dumps([self.mit_user("espuser").email,
                                   self.mit_user("starnine").email])}
 
         with mock.patch('DNS.dnslookup', return_value=[['starnine:*:84233:101:Athena Consulting Exchange User,,,:/mit/starnine:/bin/bash']]):
             self.login(self.mit_user("starnine").email)
             result1 = self.client_post("/json/messages", msg)
         with mock.patch('DNS.dnslookup', return_value=[['espuser:*:95494:101:Esp Classroom,,,:/mit/espuser:/bin/athena/bash']]):
-            self.login("espuser@mit.edu")
+            self.login(self.mit_user("espuser").email)
             result2 = self.client_post("/json/messages", msg)
         self.assertEqual(ujson.loads(result1.content)['id'],
                          ujson.loads(result2.content)['id'])
diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py
index ab48289970..0bd9b03bad 100644
--- a/zerver/tests/test_presence.py
+++ b/zerver/tests/test_presence.py
@@ -155,7 +155,7 @@ class UserPresenceTests(ZulipTestCase):
     def test_no_mit(self):
         # type: () -> None
         """Zephyr mirror realms such as MIT never get a list of users"""
-        self.login("espuser@mit.edu")
+        self.login(self.mit_user('espuser').email)
         result = self.client_post("/json/users/me/presence", {'status': 'idle'})
         self.assert_json_success(result)
         json = ujson.loads(result.content)
@@ -164,8 +164,8 @@ class UserPresenceTests(ZulipTestCase):
     def test_mirror_presence(self):
         # type: () -> None
         """Zephyr mirror realms find out the status of their mirror bot"""
-        email = 'espuser@mit.edu'
-        user_profile = get_user_profile_by_email(email)
+        user_profile = self.mit_user('espuser')
+        email = user_profile.email
         self.login(email)
 
         def post_presence():
@@ -197,7 +197,7 @@ class UserPresenceTests(ZulipTestCase):
 
     def test_same_realm(self):
         # type: () -> None
-        self.login("espuser@mit.edu")
+        self.login(self.mit_user('espuser').email)
         self.client_post("/json/users/me/presence", {'status': 'idle'})
         self.logout()
 
diff --git a/zerver/tests/test_retention.py b/zerver/tests/test_retention.py
index 5c32057f75..b575954e4a 100644
--- a/zerver/tests/test_retention.py
+++ b/zerver/tests/test_retention.py
@@ -42,7 +42,7 @@ class TestRetentionLib(ZulipTestCase):
     def _make_mit_messages(self, message_quantity, pub_date):
         # type: (int, datetime) -> Any
         # send messages from mit.edu realm and change messages pub date
-        sender = UserProfile.objects.filter(email='espuser@mit.edu').first()
+        sender = self.mit_user('espuser')
         recipient = self.mit_user('starnine')
         msgs_ids = [self.send_message(sender.email, recipient.email, Recipient.PERSONAL) for i in
                     range(message_quantity)]
diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index 2d95c9feac..f3b576133a 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -2470,7 +2470,7 @@ class GetSubscribersTest(ZulipTestCase):
         # Subscribe only ourself because invites are disabled on mit.edu
         mit_user_profile = self.mit_user('starnine')
         email = mit_user_profile.email
-        users_to_subscribe = [email, "espuser@mit.edu"]
+        users_to_subscribe = [email, self.mit_user("espuser").email]
         for email in users_to_subscribe:
             self.subscribe_to_stream(email, "mit_stream")