diff --git a/tests/cases/fourslash/renameJsSpecialAssignmentRhs1.ts b/tests/cases/fourslash/renameJsSpecialAssignmentRhs1.ts
index 013cfe34cd5..db3f1fc66e8 100644
--- a/tests/cases/fourslash/renameJsSpecialAssignmentRhs1.ts
+++ b/tests/cases/fourslash/renameJsSpecialAssignmentRhs1.ts
@@ -5,7 +5,7 @@
 ////    set: function (x) {
 ////        this._x = x;
 ////    },
-////    copy: function ([|x|]) {
+////    copy: function ([|{| "declarationRangeIndex": 0 |}x|]) {
 ////        this._x = [|x|].prop;
 ////    }
 ////};
diff --git a/tests/cases/fourslash/renameJsSpecialAssignmentRhs2.ts b/tests/cases/fourslash/renameJsSpecialAssignmentRhs2.ts
index 013cfe34cd5..db3f1fc66e8 100644
--- a/tests/cases/fourslash/renameJsSpecialAssignmentRhs2.ts
+++ b/tests/cases/fourslash/renameJsSpecialAssignmentRhs2.ts
@@ -5,7 +5,7 @@
 ////    set: function (x) {
 ////        this._x = x;
 ////    },
-////    copy: function ([|x|]) {
+////    copy: function ([|{| "declarationRangeIndex": 0 |}x|]) {
 ////        this._x = [|x|].prop;
 ////    }
 ////};
diff --git a/tests/cases/fourslash/renameLocationsForClassExpression01.ts b/tests/cases/fourslash/renameLocationsForClassExpression01.ts
index b0f2f509500..6379306608e 100644
--- a/tests/cases/fourslash/renameLocationsForClassExpression01.ts
+++ b/tests/cases/fourslash/renameLocationsForClassExpression01.ts
@@ -3,7 +3,7 @@
 ////class Foo {
 ////}
 ////
-////var x = class [|Foo|] {
+////var x = [|class [|{| "declarationRangeIndex": 0 |}Foo|] {
 ////    doIt() {
 ////        return [|Foo|];
 ////    }
@@ -11,7 +11,7 @@
 ////    static doItStatically() {
 ////        return [|Foo|].y;
 ////    }
-////}
+////}|]
 ////
 ////var y = class {
 ////   getSomeName() {
@@ -20,4 +20,5 @@
 ////}
 ////var z = class Foo {}
 
-verify.rangesAreRenameLocations();
+const [rDef, ...rest] = test.ranges();
+verify.rangesAreRenameLocations(rest);
diff --git a/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts b/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts
index 1e02e3f5284..e32a080683a 100644
--- a/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts
+++ b/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts
@@ -1,7 +1,8 @@
 /// <reference path='fourslash.ts'/>
 
-////var x = function [|f|](g: any, h: any) {
+////var x = [|function [|{| "declarationRangeIndex": 0 |}f|](g: any, h: any) {
 ////    [|f|]([|f|], g);
-////}
+////}|]
 
-verify.rangesAreRenameLocations();
+const [rDef, ...rest] = test.ranges();
+verify.rangesAreRenameLocations(rest);
diff --git a/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts b/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts
index a258bcd803d..ab835b5305c 100644
--- a/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts
+++ b/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts
@@ -3,11 +3,12 @@
 ////function f() {
 ////
 ////}
-////var x = function [|f|](g: any, h: any) {
+////var x = [|function [|{| "declarationRangeIndex": 0 |}f|](g: any, h: any) {
 ////
 ////    let helper = function f(): any { f(); }
 ////
 ////    let foo = () => [|f|]([|f|], g);
-////}
+////}|]
 
-verify.rangesAreRenameLocations();
+const [rDef, ...rest] = test.ranges();
+verify.rangesAreRenameLocations(rest);