diff --git a/tests/model/test_model.py b/tests/model/test_model.py
index 45372ba07b8..be114324269 100644
--- a/tests/model/test_model.py
+++ b/tests/model/test_model.py
@@ -888,6 +888,8 @@ def test_toggle_stream_muted_status(
             (["read"], "add"),
             (["read", "starred"], "remove"),
             (["starred", "read"], "remove"),
+            (["read", "mentioned", "wildcard_mentioned"], "add"),
+            (["mentioned", "wildcard_mentioned", "starred"], "remove"),
         ],
     )
     def test_toggle_message_star_status(
@@ -1990,11 +1992,18 @@ def test_update_star_status_invalid_operation(
             ("add", 1, ["read"], ["read", "starred"]),
             ("add", 1, ["starred"], ["starred"]),
             ("add", 1, ["read", "starred"], ["read", "starred"]),
+            ("add", 1, ["mentioned"], ["mentioned", "starred"]),
+            ("add", 1, ["mentioned", "starred"], ["mentioned", "starred"]),
+            ("add", 1, ["wildcard_mentioned"], ["wildcard_mentioned", "starred"]),
             ("remove", -1, [], []),
             ("remove", -1, ["read"], ["read"]),
             ("remove", -1, ["starred"], []),
             ("remove", -1, ["read", "starred"], ["read"]),
             ("remove", -1, ["starred", "read"], ["read"]),
+            ("remove", -1, ["mentioned"], ["mentioned"]),
+            ("remove", -1, ["wildcard_mentioned"], ["wildcard_mentioned"]),
+            ("remove", -1, ["mentioned", "starred"], ["mentioned"]),
+            ("remove", -1, ["wildcard_mentioned", "starred"], ["wildcard_mentioned"]),
         ],
     )
     def test_update_star_status(
@@ -2073,11 +2082,19 @@ def test_update_star_status(
             ("add", ["read"], ["read"]),
             ("add", ["starred"], ["starred", "read"]),
             ("add", ["read", "starred"], ["read", "starred"]),
+            ("add", ["mentioned"], ["mentioned", "read"]),
+            ("add", ["read", "mentioned"], ["read", "mentioned"]),
+            ("add", ["mentioned", "starred"], ["mentioned", "starred", "read"]),
+            ("add", ["wildcard_mentioned"], ["wildcard_mentioned", "read"]),
             ("remove", [], []),
             ("remove", ["read"], ["read"]),  # msg cannot be marked 'unread'
             ("remove", ["starred"], ["starred"]),
+            ("remove", ["mentioned"], ["mentioned"]),
             ("remove", ["starred", "read"], ["starred", "read"]),
             ("remove", ["read", "starred"], ["read", "starred"]),
+            ("remove", ["read", "mentioned"], ["read", "mentioned"]),
+            ("remove", ["wildcard_mentioned"], ["wildcard_mentioned"]),
+            ("remove", ["read", "wildcard_mentioned"], ["read", "wildcard_mentioned"]),
         ],
     )
     def test_update_read_status(