diff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart
index d6962c89a4..09c17c5c40 100644
--- a/test/widgets/content_test.dart
+++ b/test/widgets/content_test.dart
@@ -92,10 +92,14 @@ void main() {
 
   TestZulipBinding.ensureInitialized();
 
-  Future<void> prepareContentBare(WidgetTester tester, String html) async {
+  Future<void> prepareContentBare(WidgetTester tester, String html, {
+    bool wrapWithScaffold = false,
+  }) async {
     Widget widget = BlockContentList(nodes: parseContent(html).nodes);
 
-    widget = Scaffold(body: widget);
+    if (wrapWithScaffold) {
+      widget = Scaffold(body: widget);
+    }
 
     await tester.pumpWidget(
       Builder(builder: (context) =>