diff --git a/spec/std/record_spec.cr b/spec/std/record_spec.cr
index f4034e9c2293..74070802fe9f 100644
--- a/spec/std/record_spec.cr
+++ b/spec/std/record_spec.cr
@@ -1,4 +1,5 @@
 require "spec"
+require "../spec_helper"
 
 private module RecordSpec
   record Record1,
@@ -85,4 +86,17 @@ describe "record" do
   it "uses the default values on the ivars" do
     CustomInitializer.new(__id: 10).active.should be_false
   end
+
+  it "expands record macro with comments during wants_doc=true (#16074)" do
+    semantic(<<-CRYSTAL, wants_doc: true)
+    require "macros"
+    require "object/properties"
+
+    record TestRecord,
+      # This is a comment
+      test : String?
+
+    TestRecord.new("test").test
+    CRYSTAL
+  end
 end