diff --git a/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
index 6c88f64cf..fe4e66dce 100644
--- a/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`cancel edit: edit canceled 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -436,7 +436,7 @@ exports[`edit a comment: edit form 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -920,7 +920,7 @@ exports[`edit a comment: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -1404,7 +1404,7 @@ exports[`edit a comment: render stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -1813,7 +1813,7 @@ exports[`edit a comment: server response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -2231,7 +2231,7 @@ exports[`shows expiry message: edit form closed 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -2640,7 +2640,7 @@ exports[`shows expiry message: edit time expired 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
index 0488adfd4..6807911cb 100644
--- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`loads more comments 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
@@ -433,7 +433,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
index e3465217b..370974d1e 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders permalink view 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
@@ -158,7 +158,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
index e5e570da7..7d82a3165 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders permalink view with unknown asset 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
index fb8c8432c..278440fe4 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders permalink view with unknown comment 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
@@ -93,7 +93,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
index 840b02577..ebeb37d9e 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`post a comment: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -504,7 +504,7 @@ exports[`post a comment: server response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -971,7 +971,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap
index fbe3a4022..a6715bd1b 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`post a reply: open reply form 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -889,7 +889,7 @@ exports[`post a reply: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -1824,7 +1824,7 @@ exports[`post a reply: server response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -2622,7 +2622,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
index 1e208ac73..3d87473e1 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`post a reply: open reply form 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -547,7 +547,7 @@ exports[`post a reply: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -1157,7 +1157,7 @@ exports[`post a reply: server response 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
@@ -1630,7 +1630,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
     <li
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
index 7878b423e..5ae1ea927 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
index 95386e1ec..0d04969ea 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
index 3a03cfe51..b2eecc114 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
@@ -389,7 +389,7 @@ exports[`show all replies 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap
index 2320b73fe..e953357d3 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showConversation.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>
@@ -701,7 +701,7 @@ exports[`shows conversation 1`] = `
         role="tab"
         type="button"
       >
-        Comments
+        ⁨commentCount⁩ Comments
       </button>
     </li>
   </ul>