diff --git a/editions/codegen_tests/proto2_multiline_comments.proto b/editions/codegen_tests/proto2_multiline_comments.proto
index e8e106c84b..52f22013da 100644
--- a/editions/codegen_tests/proto2_multiline_comments.proto
+++ b/editions/codegen_tests/proto2_multiline_comments.proto
@@ -1,3 +1,7 @@
+//
+// Extra empty file comments.
+//
+
 syntax = "proto2";
 
 package protobuf_editions_test.proto2;
@@ -31,3 +35,13 @@ message Message3 {
    */
   optional string field = 1;
 }
+
+//
+// Extra empty message comments.
+//
+message Message4 {
+  //
+  // Extra empty field comments.
+  //
+  optional string field = 1;
+}