diff --git a/zerver/tests/test_notifications.py b/zerver/tests/test_notifications.py
index 8749acaf2d..34a62f32b2 100644
--- a/zerver/tests/test_notifications.py
+++ b/zerver/tests/test_notifications.py
@@ -37,7 +37,7 @@ class TestMissedMessages(ZulipTestCase):
         if settings.EMAIL_GATEWAY_PATTERN != "":
             reply_to_addresses = [settings.EMAIL_GATEWAY_PATTERN % (u'mm' + t) for t in tokens]
         else:
-            reply_to_addresses = ["noreply@example.com"]
+            reply_to_addresses = ["Zulip <noreply@example.com>"]
         msg = mail.outbox[0]
         sender = settings.NOREPLY_EMAIL_ADDRESS
         from_email = sender
diff --git a/zproject/local_settings.py b/zproject/local_settings.py
index 841001377a..160e09a16b 100644
--- a/zproject/local_settings.py
+++ b/zproject/local_settings.py
@@ -49,7 +49,7 @@ EMAIL_USE_TLS = True
 
 DEFAULT_FROM_EMAIL = "Zulip <zulip@zulip.com>"
 # The noreply address to be used as Reply-To for certain generated emails.
-NOREPLY_EMAIL_ADDRESS = "noreply@zulip.com"
+NOREPLY_EMAIL_ADDRESS = "Zulip <noreply@zulip.com>"
 WELCOME_EMAIL_SENDER = {'email': 'wdaher@zulip.com', 'name': 'Waseem Daher'}
 
 SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
diff --git a/zproject/prod_settings_template.py b/zproject/prod_settings_template.py
index 6fb4ae563a..57f3f22c29 100644
--- a/zproject/prod_settings_template.py
+++ b/zproject/prod_settings_template.py
@@ -68,7 +68,7 @@ EMAIL_USE_TLS = True
 DEFAULT_FROM_EMAIL = "Zulip <zulip@example.com>"
 # The noreply address to be used as Reply-To for certain generated emails.
 # Messages sent to this address should not be delivered anywhere.
-NOREPLY_EMAIL_ADDRESS = "noreply@example.com"
+NOREPLY_EMAIL_ADDRESS = "Zulip <noreply@example.com>"
 
 
 ### AUTHENTICATION SETTINGS
diff --git a/zproject/settings.py b/zproject/settings.py
index 46253aa632..54c507bf34 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -234,7 +234,7 @@ REQUIRED_SETTINGS = [("EXTERNAL_HOST", "zulip.example.com"),
                      # case, it seems worth having in this list
                      ("SECRET_KEY", ""),
                      ("AUTHENTICATION_BACKENDS", ()),
-                     ("NOREPLY_EMAIL_ADDRESS", "noreply@example.com"),
+                     ("NOREPLY_EMAIL_ADDRESS", "Zulip <noreply@example.com>"),
                      ("DEFAULT_FROM_EMAIL", "Zulip <zulip@example.com>"),
                      ]