diff --git a/src/core/client/stream/components/App.spec.tsx b/src/core/client/stream/components/App.spec.tsx
deleted file mode 100644
index 2afc61f74..000000000
--- a/src/core/client/stream/components/App.spec.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-
-import AppContainer from "../containers/AppContainer";
-
-it("renders comments", () => {
-  const wrapper = shallow(<AppContainer />);
-  expect(wrapper).toMatchSnapshot();
-});
diff --git a/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
deleted file mode 100644
index 9a2441a63..000000000
--- a/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders comments 1`] = `<Consumer />`;
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 fe4e66dce..a6bae295c 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -436,7 +436,7 @@ exports[`edit a comment: edit form 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -920,7 +920,7 @@ exports[`edit a comment: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -1404,7 +1404,7 @@ exports[`edit a comment: render stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -1813,7 +1813,7 @@ exports[`edit a comment: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -2231,7 +2231,7 @@ exports[`shows expiry message: edit form closed 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -2640,7 +2640,7 @@ exports[`shows expiry message: edit time expired 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 6807911cb..c5bddccf9 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
   </ul>
@@ -433,7 +433,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 370974d1e..df6f281c3 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
   </ul>
@@ -158,7 +158,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 7d82a3165..0cc370719 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 278440fe4..7da665351 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
   </ul>
@@ -93,7 +93,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 ebeb37d9e..ee6a14314 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -504,7 +504,7 @@ exports[`post a comment: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -971,7 +971,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 a6715bd1b..e426dd5d1 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -889,7 +889,7 @@ exports[`post a reply: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -1824,7 +1824,7 @@ exports[`post a reply: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -2622,7 +2622,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 3d87473e1..45f61f101 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -547,7 +547,7 @@ exports[`post a reply: optimistic response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -1157,7 +1157,7 @@ exports[`post a reply: server response 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
     <li
@@ -1630,7 +1630,7 @@ exports[`renders comment stream 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 5ae1ea927..434bb3ff0 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 0d04969ea..5672d8ad6 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 b2eecc114..cf6642c00 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
   </ul>
@@ -389,7 +389,7 @@ exports[`show all replies 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ 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 e953357d3..87d570681 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"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
   </ul>
@@ -701,7 +701,7 @@ exports[`shows conversation 1`] = `
         role="tab"
         type="button"
       >
-        ⁨commentCount⁩ Comments
+        ⁨6⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/create.tsx b/src/core/client/stream/test/create.tsx
index f105162c4..486f01422 100644
--- a/src/core/client/stream/test/create.tsx
+++ b/src/core/client/stream/test/create.tsx
@@ -15,6 +15,7 @@ import AppContainer from "talk-stream/containers/AppContainer";
 import createEnvironment from "./createEnvironment";
 import createFluentBundle from "./createFluentBundle";
 import createNodeMock from "./createNodeMock";
+import { comments } from "./fixtures";
 
 export interface CreateParams {
   logNetwork?: boolean;
@@ -53,7 +54,7 @@ export default function create(params: CreateParams) {
 
   const testRenderer = TestRenderer.create(
     <TalkContextProvider value={context}>
-      <AppContainer />
+      <AppContainer commentCount={comments.length} />
     </TalkContextProvider>,
     { createNodeMock }
   );