diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration1.ts
similarity index 100%
rename from tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration.ts
rename to tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration1.ts
diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts
new file mode 100644
index 00000000000..2658dd56371
--- /dev/null
+++ b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: file1.ts
+//// class Foo {
+////     constructor(private {/*0*/privateParam}: number,
+////         public {/*1*/publicParam}: string,
+////         protected {/*2*/protectedParam}: boolean) {
+//// 
+////         let localPrivate = /*3*/privateParam;
+////         this.privateParam += 10; // this is not valid syntax
+//// 
+////         let localPublic = /*4*/publicParam;
+////         this.publicParam += " Hello!";  // this is not valid syntax
+//// 
+////         let localProtected = /*5*/protectedParam;
+////         this.protectedParam = false;  // this is not valid syntax
+////     }
+//// }
+
+let markers = test.markers()
+for (let marker of markers) {
+    goTo.position(marker.position);
+    verify.documentHighlightsAtPositionCount(3, ["file1.ts"]);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts
new file mode 100644
index 00000000000..958e3bb45c9
--- /dev/null
+++ b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration3.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: file1.ts
+//// class Foo {
+////     constructor(private [/*0*/privateParam]: number,
+////         public [/*1*/publicParam]: string,
+////         protected [/*2*/protectedParam]: boolean) {
+//// 
+////         let localPrivate = /*3*/privateParam;
+////         this.privateParam += 10;  // this is not valid syntax
+//// 
+////         let localPublic = /*4*/publicParam;
+////         this.publicParam += " Hello!";  // this is not valid syntax
+//// 
+////         let localProtected = /*5*/protectedParam;
+////         this.protectedParam = false;  // this is not valid syntax
+////     }
+//// }
+
+let markers = test.markers()
+for (let marker of markers) {
+    goTo.position(marker.position);
+    verify.documentHighlightsAtPositionCount(2, ["file1.ts"]);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts
similarity index 100%
rename from tests/cases/fourslash/renameParameterPropeterDeclaration1.ts
rename to tests/cases/fourslash/renameParameterPropertyDeclaration1.ts
diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts
similarity index 100%
rename from tests/cases/fourslash/renameParameterPropeterDeclaration2.ts
rename to tests/cases/fourslash/renameParameterPropertyDeclaration2.ts
diff --git a/tests/cases/fourslash/renameParameterPropeterDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts
similarity index 100%
rename from tests/cases/fourslash/renameParameterPropeterDeclaration3.ts
rename to tests/cases/fourslash/renameParameterPropertyDeclaration3.ts
diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts
new file mode 100644
index 00000000000..21ba7da4141
--- /dev/null
+++ b/tests/cases/fourslash/renameParameterPropertyDeclaration4.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts'/>
+
+//// class Foo {
+////     constructor(protected { |protectedParam| }) {
+////         let myProtectedParam = |protectedParam|;
+////     }
+//// }
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts
new file mode 100644
index 00000000000..a4bc00b697b
--- /dev/null
+++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts'/>
+
+//// class Foo {
+////     constructor(protected [ |protectedParam| ]) {
+////         let myProtectedParam = |protectedParam|;
+////     }
+//// }
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
\ No newline at end of file