diff --git a/zerver/lib/push_notifications.py b/zerver/lib/push_notifications.py
index c5ea4ce269..dc030c45e6 100644
--- a/zerver/lib/push_notifications.py
+++ b/zerver/lib/push_notifications.py
@@ -440,11 +440,8 @@ def get_alert_from_message(message: Message) -> str:
         return "New private message from %s" % (sender_str,)
     elif message.is_stream_message() and message.trigger == 'mentioned':
         return "New mention from %s" % (sender_str,)
-    elif (message.is_stream_message() and
-            (message.trigger == 'stream_push_notify' and message.stream_name)):
+    else:  # message.is_stream_message() and message.trigger == 'stream_push_notify'
         return "New stream message from %s in %s" % (sender_str, message.stream_name,)
-    else:
-        return "New Zulip mentions and private messages from %s" % (sender_str,)
 
 def get_mobile_push_content(rendered_content: str) -> str:
     def get_text(elem: LH.HtmlElement) -> str:
diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py
index f1bdfba0ab..070ba95449 100644
--- a/zerver/tests/test_push_notifications.py
+++ b/zerver/tests/test_push_notifications.py
@@ -731,42 +731,7 @@ class TestAPNs(PushNotificationTest):
         self.assertEqual(
             apn.modernize_apns_payload(payload),
             payload)
-
-class TestGetAlertFromMessage(PushNotificationTest):
-    def test_get_alert_from_private_group_message(self) -> None:
-        message = self.get_message(Recipient.HUDDLE)
-        message.trigger = 'private_message'
-        alert = apn.get_alert_from_message(message)
-        self.assertEqual(alert, "New private group message from King Hamlet")
-
-    def test_get_alert_from_private_message(self) -> None:
-        message = self.get_message(Recipient.PERSONAL)
-        message.trigger = 'private_message'
-        alert = apn.get_alert_from_message(message)
-        self.assertEqual(alert, "New private message from King Hamlet")
-
-    def test_get_alert_from_mention(self) -> None:
-        message = self.get_message(Recipient.STREAM)
-        message.trigger = 'mentioned'
-        alert = apn.get_alert_from_message(message)
-        self.assertEqual(alert, "New mention from King Hamlet")
-
-    def test_get_alert_from_stream_message(self) -> None:
-        message = self.get_message(Recipient.STREAM)
-        message.trigger = 'stream_push_notify'
-        message.stream_name = 'Denmark'
-        alert = apn.get_alert_from_message(message)
-        self.assertEqual(alert, "New stream message from King Hamlet in Denmark")
-
-    def test_get_alert_from_other_message(self) -> None:
-        message = self.get_message(0)
-        message.trigger = 'stream_push_notify'
-        alert = apn.get_alert_from_message(message)
-        alert = apn.get_alert_from_message(self.get_message(0))
-        self.assertEqual(alert,
-                         "New Zulip mentions and private messages from King "
-                         "Hamlet")
-
+            
 class TestGetAPNsPayload(PushNotificationTest):
     def test_get_apns_payload(self) -> None:
         user_profile = self.example_user("othello")