diff --git a/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts b/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts
new file mode 100644
index 00000000000..d491ad24d7a
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////   /* comment1 */
+////   class /* comment2 */ class1 {
+////   }
+//// } |]
+
+verify.rangeAfterCodeFix(`namespace greeter {
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
diff --git a/tests/cases/fourslash/unusedClassInNamespaceWithTriviaAddUnderscore.ts b/tests/cases/fourslash/unusedClassInNamespaceWithTriviaAddUnderscore.ts
new file mode 100644
index 00000000000..524b0abebc9
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespaceWithTriviaAddUnderscore.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////   /* comment1 */
+////   class /* comment2 */ class1 {
+////   }
+//// } |]
+
+verify.rangeAfterCodeFix(`namespace greeter {
+    /* comment1 */
+    class /* comment2 */ _class1 {
+    }
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);