diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index dd02e967b15..0491e611814 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -11,11 +11,11 @@ class c1 {
     /** getter property*/
     public get p3() {
         return this.p2(this.p1);
-    }
+    }// trailing comment Getter
     /** setter property*/
     public set p3(/** this is value*/value: number) {
         this.p1 = this.p2(value);
-    }
+    }// trailing comment Setter
     /** pp1 is property of c1*/
     private pp1: number;
     /** sum with property*/
@@ -42,11 +42,11 @@ class c1 {
     /** static getter property*/
     static get s3() {
         return c1.s2(c1.s1);
-    }
+    } /*trailing comment 1 getter*/
     /** setter property*/
     static set s3( /** this is value*/value: number) {
         c1.s1 = c1.s2(value);
-    }
+    }/*trailing comment 2 */ /*setter*/
     public nc_p1: number;
     public nc_p2(b: number) {
         return this.nc_p1 + b;
@@ -229,11 +229,13 @@ var c1 = (function () {
         /** getter property*/
         get: function () {
             return this.p2(this.p1);
-        },
+        } // trailing comment Getter
+        ,
         /** setter property*/
         set: function (value) {
             this.p1 = this.p2(value);
-        },
+        } // trailing comment Setter
+        ,
         enumerable: true,
         configurable: true
     });
@@ -261,11 +263,11 @@ var c1 = (function () {
         /** static getter property*/
         get: function () {
             return c1.s2(c1.s1);
-        },
+        } /*trailing comment 1 getter*/ ,
         /** setter property*/
         set: function (value) {
             c1.s1 = c1.s2(value);
-        },
+        } /*trailing comment 2 */ /*setter*/ ,
         enumerable: true,
         configurable: true
     });
diff --git a/tests/cases/compiler/commentsClassMembers.ts b/tests/cases/compiler/commentsClassMembers.ts
index 8b418e58661..6ff1abb6429 100644
--- a/tests/cases/compiler/commentsClassMembers.ts
+++ b/tests/cases/compiler/commentsClassMembers.ts
@@ -13,11 +13,11 @@ class c1 {
     /** getter property*/
     public get p3() {
         return this.p2(this.p1);
-    }
+    }// trailing comment Getter
     /** setter property*/
     public set p3(/** this is value*/value: number) {
         this.p1 = this.p2(value);
-    }
+    }// trailing comment Setter
     /** pp1 is property of c1*/
     private pp1: number;
     /** sum with property*/
@@ -44,11 +44,11 @@ class c1 {
     /** static getter property*/
     static get s3() {
         return c1.s2(c1.s1);
-    }
+    } /*trailing comment 1 getter*/
     /** setter property*/
     static set s3( /** this is value*/value: number) {
         c1.s1 = c1.s2(value);
-    }
+    }/*trailing comment 2 */ /*setter*/
     public nc_p1: number;
     public nc_p2(b: number) {
         return this.nc_p1 + b;