diff --git a/tests/baselines/reference/commentOnAmbientClass1.js b/tests/baselines/reference/commentOnAmbientClass1.js
index beacc71335c..9837da4c371 100644
--- a/tests/baselines/reference/commentOnAmbientClass1.js
+++ b/tests/baselines/reference/commentOnAmbientClass1.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnAmbientClass1.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare class C {
 }
 
@@ -15,6 +20,9 @@ declare class E extends C {
 }
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 //// [b.js]
 ///<reference path="a.ts"/>
diff --git a/tests/baselines/reference/commentOnAmbientClass1.symbols b/tests/baselines/reference/commentOnAmbientClass1.symbols
index 899c5f19a24..a08bb744df4 100644
--- a/tests/baselines/reference/commentOnAmbientClass1.symbols
+++ b/tests/baselines/reference/commentOnAmbientClass1.symbols
@@ -5,13 +5,18 @@ declare class E extends C {
 >C : Symbol(C, Decl(a.ts, 0, 0))
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare class C {
 >C : Symbol(C, Decl(a.ts, 0, 0))
 }
 
 // Don't keep this comment.
 declare class D {
->D : Symbol(D, Decl(a.ts, 2, 1))
+>D : Symbol(D, Decl(a.ts, 7, 1))
 }
 
diff --git a/tests/baselines/reference/commentOnAmbientClass1.types b/tests/baselines/reference/commentOnAmbientClass1.types
index 44c0334ef6c..b0212056505 100644
--- a/tests/baselines/reference/commentOnAmbientClass1.types
+++ b/tests/baselines/reference/commentOnAmbientClass1.types
@@ -5,7 +5,12 @@ declare class E extends C {
 >C : C
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare class C {
 >C : C
 }
diff --git a/tests/baselines/reference/commentOnAmbientEnum.js b/tests/baselines/reference/commentOnAmbientEnum.js
index d602c68a0e5..f6c9d92ebff 100644
--- a/tests/baselines/reference/commentOnAmbientEnum.js
+++ b/tests/baselines/reference/commentOnAmbientEnum.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnAmbientEnum.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare enum C {
     a,
     b,
@@ -18,6 +23,9 @@ declare enum E {
 }
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 //// [b.js]
 ///<reference path="a.ts"/>
diff --git a/tests/baselines/reference/commentOnAmbientEnum.symbols b/tests/baselines/reference/commentOnAmbientEnum.symbols
index d86d490113d..3a6e8089d4b 100644
--- a/tests/baselines/reference/commentOnAmbientEnum.symbols
+++ b/tests/baselines/reference/commentOnAmbientEnum.symbols
@@ -4,22 +4,27 @@ declare enum E {
 >E : Symbol(E, Decl(b.ts, 0, 0))
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare enum C {
 >C : Symbol(C, Decl(a.ts, 0, 0))
 
     a,
->a : Symbol(C.a, Decl(a.ts, 1, 16))
+>a : Symbol(C.a, Decl(a.ts, 6, 16))
 
     b,
->b : Symbol(C.b, Decl(a.ts, 2, 6))
+>b : Symbol(C.b, Decl(a.ts, 7, 6))
 
     c
->c : Symbol(C.c, Decl(a.ts, 3, 6))
+>c : Symbol(C.c, Decl(a.ts, 8, 6))
 }
 
 // Don't keep this comment.
 declare enum D {
->D : Symbol(D, Decl(a.ts, 5, 1))
+>D : Symbol(D, Decl(a.ts, 10, 1))
 }
 
diff --git a/tests/baselines/reference/commentOnAmbientEnum.types b/tests/baselines/reference/commentOnAmbientEnum.types
index 4a0193b7937..95f3d61b75f 100644
--- a/tests/baselines/reference/commentOnAmbientEnum.types
+++ b/tests/baselines/reference/commentOnAmbientEnum.types
@@ -4,7 +4,12 @@ declare enum E {
 >E : E
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare enum C {
 >C : C
 
diff --git a/tests/baselines/reference/commentOnAmbientModule.js b/tests/baselines/reference/commentOnAmbientModule.js
index d5a536302b5..2d43b502f29 100644
--- a/tests/baselines/reference/commentOnAmbientModule.js
+++ b/tests/baselines/reference/commentOnAmbientModule.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnAmbientModule.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare module C {
     function foo();
 }
@@ -20,6 +25,9 @@ declare module E {
 }
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 //// [b.js]
 ///<reference path="a.ts"/>
diff --git a/tests/baselines/reference/commentOnAmbientModule.symbols b/tests/baselines/reference/commentOnAmbientModule.symbols
index c1412c17880..e7525e6306f 100644
--- a/tests/baselines/reference/commentOnAmbientModule.symbols
+++ b/tests/baselines/reference/commentOnAmbientModule.symbols
@@ -5,28 +5,33 @@ declare module E {
 
     class foobar extends D.bar {
 >foobar : Symbol(foobar, Decl(b.ts, 1, 18))
->D.bar : Symbol(D.bar, Decl(a.ts, 6, 18))
->D : Symbol(D, Decl(a.ts, 3, 1))
->bar : Symbol(D.bar, Decl(a.ts, 6, 18))
+>D.bar : Symbol(D.bar, Decl(a.ts, 11, 18))
+>D : Symbol(D, Decl(a.ts, 8, 1))
+>bar : Symbol(D.bar, Decl(a.ts, 11, 18))
 
         foo();
 >foo : Symbol(foo, Decl(b.ts, 2, 32))
     }
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare module C {
 >C : Symbol(C, Decl(a.ts, 0, 0))
 
     function foo();
->foo : Symbol(foo, Decl(a.ts, 1, 18))
+>foo : Symbol(foo, Decl(a.ts, 6, 18))
 }
 
 // Don't keep this comment.
 declare module D {
->D : Symbol(D, Decl(a.ts, 3, 1))
+>D : Symbol(D, Decl(a.ts, 8, 1))
 
     class bar { }
->bar : Symbol(bar, Decl(a.ts, 6, 18))
+>bar : Symbol(bar, Decl(a.ts, 11, 18))
 }
 
diff --git a/tests/baselines/reference/commentOnAmbientModule.types b/tests/baselines/reference/commentOnAmbientModule.types
index 629395a4e80..f54d248b461 100644
--- a/tests/baselines/reference/commentOnAmbientModule.types
+++ b/tests/baselines/reference/commentOnAmbientModule.types
@@ -14,7 +14,12 @@ declare module E {
     }
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare module C {
 >C : typeof C
 
diff --git a/tests/baselines/reference/commentOnAmbientVariable1.js b/tests/baselines/reference/commentOnAmbientVariable1.js
index b76fd3345b5..79c5dc85f23 100644
--- a/tests/baselines/reference/commentOnAmbientVariable1.js
+++ b/tests/baselines/reference/commentOnAmbientVariable1.js
@@ -1,9 +1,17 @@
 //// [commentOnAmbientVariable1.ts]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare var v: number;
 
 // Don't keep this comment.
 declare var y: number;
 
 //// [commentOnAmbientVariable1.js]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
diff --git a/tests/baselines/reference/commentOnAmbientVariable1.symbols b/tests/baselines/reference/commentOnAmbientVariable1.symbols
index 153653e7827..7847b4b85ad 100644
--- a/tests/baselines/reference/commentOnAmbientVariable1.symbols
+++ b/tests/baselines/reference/commentOnAmbientVariable1.symbols
@@ -1,9 +1,14 @@
 === tests/cases/compiler/commentOnAmbientVariable1.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare var v: number;
->v : Symbol(v, Decl(commentOnAmbientVariable1.ts, 1, 11))
+>v : Symbol(v, Decl(commentOnAmbientVariable1.ts, 6, 11))
 
 // Don't keep this comment.
 declare var y: number;
->y : Symbol(y, Decl(commentOnAmbientVariable1.ts, 4, 11))
+>y : Symbol(y, Decl(commentOnAmbientVariable1.ts, 9, 11))
 
diff --git a/tests/baselines/reference/commentOnAmbientVariable1.types b/tests/baselines/reference/commentOnAmbientVariable1.types
index feff50f4293..645e1f099d4 100644
--- a/tests/baselines/reference/commentOnAmbientVariable1.types
+++ b/tests/baselines/reference/commentOnAmbientVariable1.types
@@ -1,5 +1,10 @@
 === tests/cases/compiler/commentOnAmbientVariable1.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare var v: number;
 >v : number
 
diff --git a/tests/baselines/reference/commentOnAmbientfunction.js b/tests/baselines/reference/commentOnAmbientfunction.js
index 6290d407727..22613236941 100644
--- a/tests/baselines/reference/commentOnAmbientfunction.js
+++ b/tests/baselines/reference/commentOnAmbientfunction.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnAmbientfunction.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare function foo();
 
 // Don't keep this comment.
@@ -12,6 +17,9 @@ declare function bar();
 declare function foobar(a: typeof foo): typeof bar;
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 //// [b.js]
 ///<reference path="a.ts"/>
diff --git a/tests/baselines/reference/commentOnAmbientfunction.symbols b/tests/baselines/reference/commentOnAmbientfunction.symbols
index c6afb72eb9c..4d83d2794a0 100644
--- a/tests/baselines/reference/commentOnAmbientfunction.symbols
+++ b/tests/baselines/reference/commentOnAmbientfunction.symbols
@@ -4,14 +4,19 @@ declare function foobar(a: typeof foo): typeof bar;
 >foobar : Symbol(foobar, Decl(b.ts, 0, 0))
 >a : Symbol(a, Decl(b.ts, 1, 24))
 >foo : Symbol(foo, Decl(a.ts, 0, 0))
->bar : Symbol(bar, Decl(a.ts, 1, 23))
+>bar : Symbol(bar, Decl(a.ts, 6, 23))
 
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare function foo();
 >foo : Symbol(foo, Decl(a.ts, 0, 0))
 
 // Don't keep this comment.
 declare function bar();
->bar : Symbol(bar, Decl(a.ts, 1, 23))
+>bar : Symbol(bar, Decl(a.ts, 6, 23))
 
diff --git a/tests/baselines/reference/commentOnAmbientfunction.types b/tests/baselines/reference/commentOnAmbientfunction.types
index f75f7b377fb..3347a55bf68 100644
--- a/tests/baselines/reference/commentOnAmbientfunction.types
+++ b/tests/baselines/reference/commentOnAmbientfunction.types
@@ -7,7 +7,12 @@ declare function foobar(a: typeof foo): typeof bar;
 >bar : () => any
 
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare function foo();
 >foo : () => any
 
diff --git a/tests/baselines/reference/commentOnElidedModule1.js b/tests/baselines/reference/commentOnElidedModule1.js
index 8a7b8d91b4c..72585e6a9e8 100644
--- a/tests/baselines/reference/commentOnElidedModule1.js
+++ b/tests/baselines/reference/commentOnElidedModule1.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnElidedModule1.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 module ElidedModule {
 }
 
@@ -15,6 +20,9 @@ module ElidedModule3 {
 }
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
 //// [b.js]
 ///<reference path="a.ts"/>
diff --git a/tests/baselines/reference/commentOnElidedModule1.symbols b/tests/baselines/reference/commentOnElidedModule1.symbols
index 63ce4dadf97..57b55adeee4 100644
--- a/tests/baselines/reference/commentOnElidedModule1.symbols
+++ b/tests/baselines/reference/commentOnElidedModule1.symbols
@@ -4,13 +4,18 @@ module ElidedModule3 {
 >ElidedModule3 : Symbol(ElidedModule3, Decl(b.ts, 0, 0))
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 module ElidedModule {
 >ElidedModule : Symbol(ElidedModule, Decl(a.ts, 0, 0))
 }
 
 // Don't keep this comment.
 module ElidedModule2 {
->ElidedModule2 : Symbol(ElidedModule2, Decl(a.ts, 2, 1))
+>ElidedModule2 : Symbol(ElidedModule2, Decl(a.ts, 7, 1))
 }
 
diff --git a/tests/baselines/reference/commentOnElidedModule1.types b/tests/baselines/reference/commentOnElidedModule1.types
index 8e095b8102f..d028b62519a 100644
--- a/tests/baselines/reference/commentOnElidedModule1.types
+++ b/tests/baselines/reference/commentOnElidedModule1.types
@@ -4,7 +4,12 @@ module ElidedModule3 {
 >ElidedModule3 : any
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 module ElidedModule {
 >ElidedModule : any
 }
diff --git a/tests/baselines/reference/commentOnInterface1.js b/tests/baselines/reference/commentOnInterface1.js
index bde6202f03f..c51658e2dfa 100644
--- a/tests/baselines/reference/commentOnInterface1.js
+++ b/tests/baselines/reference/commentOnInterface1.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnInterface1.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 interface I {
 }
 
@@ -15,6 +20,9 @@ interface I3 {
 }
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
 //// [b.js]
 ///<reference path='a.ts'/>
diff --git a/tests/baselines/reference/commentOnInterface1.symbols b/tests/baselines/reference/commentOnInterface1.symbols
index 9564d9b4cfa..8ed7e020712 100644
--- a/tests/baselines/reference/commentOnInterface1.symbols
+++ b/tests/baselines/reference/commentOnInterface1.symbols
@@ -4,13 +4,18 @@ interface I3 {
 >I3 : Symbol(I3, Decl(b.ts, 0, 0))
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 interface I {
 >I : Symbol(I, Decl(a.ts, 0, 0))
 }
 
 // Don't keep this comment.
 interface I2 {
->I2 : Symbol(I2, Decl(a.ts, 2, 1))
+>I2 : Symbol(I2, Decl(a.ts, 7, 1))
 }
 
diff --git a/tests/baselines/reference/commentOnInterface1.types b/tests/baselines/reference/commentOnInterface1.types
index d03b1939026..34b0e0ce14f 100644
--- a/tests/baselines/reference/commentOnInterface1.types
+++ b/tests/baselines/reference/commentOnInterface1.types
@@ -4,7 +4,12 @@ interface I3 {
 >I3 : I3
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 interface I {
 >I : I
 }
diff --git a/tests/baselines/reference/commentOnSignature1.js b/tests/baselines/reference/commentOnSignature1.js
index 1b2327f9861..d29710c631c 100644
--- a/tests/baselines/reference/commentOnSignature1.js
+++ b/tests/baselines/reference/commentOnSignature1.js
@@ -1,7 +1,12 @@
 //// [tests/cases/compiler/commentOnSignature1.ts] ////
 
 //// [a.ts]
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 function foo(n: number): void;
 // Don't keep this comment.
 function foo(s: string): void;
@@ -33,14 +38,15 @@ function foo2(a: any): void {
 }
 
 //// [a.js]
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
 function foo(a) {
 }
 var c = (function () {
-    /*! keep this pinned comment */
     function c(a) {
     }
-    /*! keep this pinned comment */
     c.prototype.foo = function (a) {
     };
     return c;
diff --git a/tests/baselines/reference/commentOnSignature1.symbols b/tests/baselines/reference/commentOnSignature1.symbols
index 0d39565fb61..7f0d48401cd 100644
--- a/tests/baselines/reference/commentOnSignature1.symbols
+++ b/tests/baselines/reference/commentOnSignature1.symbols
@@ -14,49 +14,54 @@ function foo2(a: any): void {
 >a : Symbol(a, Decl(b.ts, 4, 14))
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 function foo(n: number): void;
->foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(a.ts, 1, 30), Decl(a.ts, 3, 30))
->n : Symbol(n, Decl(a.ts, 1, 13))
+>foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(a.ts, 6, 30), Decl(a.ts, 8, 30))
+>n : Symbol(n, Decl(a.ts, 6, 13))
 
 // Don't keep this comment.
 function foo(s: string): void;
->foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(a.ts, 1, 30), Decl(a.ts, 3, 30))
->s : Symbol(s, Decl(a.ts, 3, 13))
+>foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(a.ts, 6, 30), Decl(a.ts, 8, 30))
+>s : Symbol(s, Decl(a.ts, 8, 13))
 
 function foo(a: any): void {
->foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(a.ts, 1, 30), Decl(a.ts, 3, 30))
->a : Symbol(a, Decl(a.ts, 4, 13))
+>foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(a.ts, 6, 30), Decl(a.ts, 8, 30))
+>a : Symbol(a, Decl(a.ts, 9, 13))
 }
 
 class c {
->c : Symbol(c, Decl(a.ts, 5, 1))
+>c : Symbol(c, Decl(a.ts, 10, 1))
 
     // dont keep this comment
     constructor(a: string);
->a : Symbol(a, Decl(a.ts, 9, 16))
+>a : Symbol(a, Decl(a.ts, 14, 16))
 
     /*! keep this pinned comment */
     constructor(a: number);
->a : Symbol(a, Decl(a.ts, 11, 16))
+>a : Symbol(a, Decl(a.ts, 16, 16))
 
     constructor(a: any) {
->a : Symbol(a, Decl(a.ts, 12, 16))
+>a : Symbol(a, Decl(a.ts, 17, 16))
     }
 
     // dont keep this comment
     foo(a: string);
->foo : Symbol(foo, Decl(a.ts, 13, 5), Decl(a.ts, 16, 19), Decl(a.ts, 18, 19))
->a : Symbol(a, Decl(a.ts, 16, 8))
+>foo : Symbol(foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
+>a : Symbol(a, Decl(a.ts, 21, 8))
 
     /*! keep this pinned comment */
     foo(a: number);
->foo : Symbol(foo, Decl(a.ts, 13, 5), Decl(a.ts, 16, 19), Decl(a.ts, 18, 19))
->a : Symbol(a, Decl(a.ts, 18, 8))
+>foo : Symbol(foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
+>a : Symbol(a, Decl(a.ts, 23, 8))
 
     foo(a: any) {
->foo : Symbol(foo, Decl(a.ts, 13, 5), Decl(a.ts, 16, 19), Decl(a.ts, 18, 19))
->a : Symbol(a, Decl(a.ts, 19, 8))
+>foo : Symbol(foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
+>a : Symbol(a, Decl(a.ts, 24, 8))
     }
 }
 
diff --git a/tests/baselines/reference/commentOnSignature1.types b/tests/baselines/reference/commentOnSignature1.types
index 790aaaf7523..30898e22851 100644
--- a/tests/baselines/reference/commentOnSignature1.types
+++ b/tests/baselines/reference/commentOnSignature1.types
@@ -14,7 +14,12 @@ function foo2(a: any): void {
 >a : any
 }
 === tests/cases/compiler/a.ts ===
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 function foo(n: number): void;
 >foo : { (n: number): void; (s: string): void; }
 >n : number
diff --git a/tests/baselines/reference/pinnedComments1.js b/tests/baselines/reference/pinnedComments1.js
index c4b8b41fbd7..9ab2a147e6a 100644
--- a/tests/baselines/reference/pinnedComments1.js
+++ b/tests/baselines/reference/pinnedComments1.js
@@ -1,12 +1,19 @@
 //// [pinnedComments1.ts]
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 
 /* unpinned comment */
-/*! pinned comment */
+/*! pinned comment that need to be removed */
 class C {
 }
 
 //// [pinnedComments1.js]
-/*! pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/pinnedComments1.symbols b/tests/baselines/reference/pinnedComments1.symbols
index 53d46ecbaf6..6ee37435dfa 100644
--- a/tests/baselines/reference/pinnedComments1.symbols
+++ b/tests/baselines/reference/pinnedComments1.symbols
@@ -1,7 +1,11 @@
 === tests/cases/compiler/pinnedComments1.ts ===
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 
 /* unpinned comment */
-/*! pinned comment */
+/*! pinned comment that need to be removed */
 class C {
 >C : Symbol(C, Decl(pinnedComments1.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/pinnedComments1.types b/tests/baselines/reference/pinnedComments1.types
index d55feb67659..df97cbdbec9 100644
--- a/tests/baselines/reference/pinnedComments1.types
+++ b/tests/baselines/reference/pinnedComments1.types
@@ -1,7 +1,11 @@
 === tests/cases/compiler/pinnedComments1.ts ===
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 
 /* unpinned comment */
-/*! pinned comment */
+/*! pinned comment that need to be removed */
 class C {
 >C : C
 }
diff --git a/tests/cases/compiler/commentOnAmbientClass1.ts b/tests/cases/compiler/commentOnAmbientClass1.ts
index c13e4193512..1c153e86bf2 100644
--- a/tests/cases/compiler/commentOnAmbientClass1.ts
+++ b/tests/cases/compiler/commentOnAmbientClass1.ts
@@ -1,5 +1,10 @@
 //@filename: a.ts
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare class C {
 }
 
diff --git a/tests/cases/compiler/commentOnAmbientEnum.ts b/tests/cases/compiler/commentOnAmbientEnum.ts
index a9ebe107c98..20d89c1b70d 100644
--- a/tests/cases/compiler/commentOnAmbientEnum.ts
+++ b/tests/cases/compiler/commentOnAmbientEnum.ts
@@ -1,5 +1,10 @@
 //@filename: a.ts
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare enum C {
     a,
     b,
diff --git a/tests/cases/compiler/commentOnAmbientModule.ts b/tests/cases/compiler/commentOnAmbientModule.ts
index 41e12a61902..a8aeab7efba 100644
--- a/tests/cases/compiler/commentOnAmbientModule.ts
+++ b/tests/cases/compiler/commentOnAmbientModule.ts
@@ -1,5 +1,10 @@
 //@filename: a.ts
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare module C {
     function foo();
 }
diff --git a/tests/cases/compiler/commentOnAmbientVariable1.ts b/tests/cases/compiler/commentOnAmbientVariable1.ts
index 0124be05053..ef539441bd2 100644
--- a/tests/cases/compiler/commentOnAmbientVariable1.ts
+++ b/tests/cases/compiler/commentOnAmbientVariable1.ts
@@ -1,4 +1,9 @@
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare var v: number;
 
 // Don't keep this comment.
diff --git a/tests/cases/compiler/commentOnAmbientfunction.ts b/tests/cases/compiler/commentOnAmbientfunction.ts
index d549303fc4f..51f3b6194b5 100644
--- a/tests/cases/compiler/commentOnAmbientfunction.ts
+++ b/tests/cases/compiler/commentOnAmbientfunction.ts
@@ -1,5 +1,10 @@
 //@filename: a.ts
-/*! Keep this pinned comment */
+/*!=========
+    Keep this pinned comment
+   =========
+*/
+
+/*! Don't keep this pinned comment */
 declare function foo();
 
 // Don't keep this comment.
diff --git a/tests/cases/compiler/commentOnElidedModule1.ts b/tests/cases/compiler/commentOnElidedModule1.ts
index 22014a86f5b..0cdb7694273 100644
--- a/tests/cases/compiler/commentOnElidedModule1.ts
+++ b/tests/cases/compiler/commentOnElidedModule1.ts
@@ -1,5 +1,10 @@
 //@filename: a.ts
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 module ElidedModule {
 }
 
diff --git a/tests/cases/compiler/commentOnInterface1.ts b/tests/cases/compiler/commentOnInterface1.ts
index a394da0dd2c..c22229b7ccf 100644
--- a/tests/cases/compiler/commentOnInterface1.ts
+++ b/tests/cases/compiler/commentOnInterface1.ts
@@ -1,5 +1,10 @@
 //@filename: a.ts
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 interface I {
 }
 
diff --git a/tests/cases/compiler/commentOnSignature1.ts b/tests/cases/compiler/commentOnSignature1.ts
index 770c103a9fc..e8d2d831e8b 100644
--- a/tests/cases/compiler/commentOnSignature1.ts
+++ b/tests/cases/compiler/commentOnSignature1.ts
@@ -1,5 +1,10 @@
 // @filename: a.ts
-/*! Keep this pinned comment */
+/*!=================
+    Keep this pinned
+   =================
+*/
+
+/*! Don't keep this pinned comment */
 function foo(n: number): void;
 // Don't keep this comment.
 function foo(s: string): void;
diff --git a/tests/cases/compiler/pinnedComments1.ts b/tests/cases/compiler/pinnedComments1.ts
index 474769e9b20..4de91b33e56 100644
--- a/tests/cases/compiler/pinnedComments1.ts
+++ b/tests/cases/compiler/pinnedComments1.ts
@@ -1,6 +1,10 @@
 // @comments: false
+/*!=========
+    Keep this pinned comment
+   =========
+*/
 
 /* unpinned comment */
-/*! pinned comment */
+/*! pinned comment that need to be removed */
 class C {
 }
\ No newline at end of file