diff --git a/src/core/client/stream/test/comments/permalink/create.ts b/src/core/client/stream/test/comments/permalink/create.ts
index 3de9a4b2d..36fe3adeb 100644
--- a/src/core/client/stream/test/comments/permalink/create.ts
+++ b/src/core/client/stream/test/comments/permalink/create.ts
@@ -1,26 +1,10 @@
-import { GQLResolver, StoryToCommentsResolver } from "coral-framework/schema";
-import {
-  createQueryResolverOverwrite,
-  CreateTestRendererParams,
-  overwriteQueryResolver,
-} from "coral-framework/testHelpers";
-import { storyWithNoComments } from "coral-stream/test/fixtures";
+import { CreateTestRendererParams } from "coral-framework/testHelpers";
 
 import createTopLevel from "../create";
 
 export default function create(params: CreateTestRendererParams) {
   return createTopLevel({
     ...params,
-    resolvers: overwriteQueryResolver<GQLResolver>(params.resolvers || {}, {
-      story: {
-        featuredComments: createQueryResolverOverwrite<StoryToCommentsResolver>(
-          ({ variables }) => {
-            // TODO: (cvle) Remove this overwrite once we have featured comment counts.
-            return storyWithNoComments.comments;
-          }
-        ),
-      },
-    }),
     initLocalState: (localRecord, source, environment) => {
       if (params.initLocalState) {
         params.initLocalState(localRecord, source, environment);
diff --git a/src/core/client/stream/test/comments/stream/create.ts b/src/core/client/stream/test/comments/stream/create.ts
index a917b691d..c12932d7e 100644
--- a/src/core/client/stream/test/comments/stream/create.ts
+++ b/src/core/client/stream/test/comments/stream/create.ts
@@ -1,26 +1,10 @@
-import { GQLResolver, StoryToCommentsResolver } from "coral-framework/schema";
-import {
-  createQueryResolverOverwrite,
-  CreateTestRendererParams,
-  overwriteQueryResolver,
-} from "coral-framework/testHelpers";
-import { storyWithNoComments } from "coral-stream/test/fixtures";
+import { CreateTestRendererParams } from "coral-framework/testHelpers";
 
 import createTopLevel from "../create";
 
 export default function create(params: CreateTestRendererParams) {
   return createTopLevel({
     ...params,
-    resolvers: overwriteQueryResolver<GQLResolver>(params.resolvers || {}, {
-      story: {
-        featuredComments: createQueryResolverOverwrite<StoryToCommentsResolver>(
-          () => {
-            // TODO: remove this.
-            return storyWithNoComments.comments;
-          }
-        ),
-      },
-    }),
     initLocalState: (localRecord, source, environment) => {
       localRecord.setValue("ALL_COMMENTS", "commentsTab");
       if (params.initLocalState) {