diff --git a/tests/cases/fourslash/unusedClassInNamespace1AddUnderscore.ts b/tests/cases/fourslash/unusedClassInNamespace1AddUnderscore.ts
new file mode 100644
index 00000000000..8f8ceab8615
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace1AddUnderscore.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////   class class1 {
+////   }
+//// } |]
+
+verify.rangeAfterCodeFix(`namespace greeter {
+    class _class1 { }
+}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespac4AddUnderscore.ts b/tests/cases/fourslash/unusedFunctionInNamespac4AddUnderscore.ts
new file mode 100644
index 00000000000..a017fd81f1f
--- /dev/null
+++ b/tests/cases/fourslash/unusedFunctionInNamespac4AddUnderscore.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+//// [| namespace Validation {
+////    var function1 = function() {
+////    }
+////} |]
+
+verify.rangeAfterCodeFix(`namespace Validation {
+   var _function1 = function() {
+   }
+} `, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS2AddUnderscore.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS2AddUnderscore.ts
new file mode 100644
index 00000000000..ecad94397c8
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS2AddUnderscore.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+////class greeter {
+////    [|constructor() {
+////        var unused = 20;
+////        var used = "dummy";
+////        used = used + "second part";
+////    } |]
+////}
+
+verify.rangeAfterCodeFix(`
+    constructor() {
+        var _unused = 20;
+        var used = "dummy";
+        used = used + "second part";
+    }
+`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass3AddUnderscore.ts b/tests/cases/fourslash/unusedTypeParametersInClass3AddUnderscore.ts
new file mode 100644
index 00000000000..b1bf52d3043
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInClass3AddUnderscore.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////[|class greeter<X, Y, Z> |] {
+////    public a: X;
+////    public b: Z;
+////}
+
+verify.rangeAfterCodeFix("class greeter<X, _Y, Z>", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);