diff --git a/comp/src/gb.test.tap/.src/SampleTest.module b/comp/src/gb.test.tap/.src/SampleTest.module
index 7f1c0e131..fb0faaa38 100644
--- a/comp/src/gb.test.tap/.src/SampleTest.module
+++ b/comp/src/gb.test.tap/.src/SampleTest.module
@@ -31,6 +31,8 @@ Public Sub Main()
             Exec ["/usr/bin/mountpoint", "/home"] To sCapture
             .Equals(Process.LastValue, 0, "/home is a mountpoint")
         Endif
+
+        .Note("That's it.\nBye.")
     End With
 
 End
diff --git a/comp/src/gb.test.tap/.src/Tap/TapPrinter.class b/comp/src/gb.test.tap/.src/Tap/TapPrinter.class
index 710e4e2a9..dba0780df 100644
--- a/comp/src/gb.test.tap/.src/Tap/TapPrinter.class
+++ b/comp/src/gb.test.tap/.src/Tap/TapPrinter.class
@@ -98,7 +98,11 @@ End
 
 Public Sub Diagnostic(Comment As String)
 
-    Print("# " & Comment)
+    Dim sLine As String
+
+    For Each sLine In Split(Trim$(Comment), "\n")
+        Print("# " & sLine)
+    Next
 
 End