diff --git a/tests/cases/fourslash/renameCrossJsTs01.ts b/tests/cases/fourslash/renameCrossJsTs01.ts
index fbe0d4395cd..b4b3448d8c8 100644
--- a/tests/cases/fourslash/renameCrossJsTs01.ts
+++ b/tests/cases/fourslash/renameCrossJsTs01.ts
@@ -2,12 +2,12 @@
 
 // @allowJs: true
 // @Filename: a.js
-////exports.[|area|] = function (r) { return r * r; }
+////[|exports.[|{| "declarationRangeIndex": 0 |}area|] = function (r) { return r * r; }|]
 
 // @Filename: b.ts
-////import { [|area|] } from './a';
+////[|import { [|{| "declarationRangeIndex": 2 |}area|] } from './a';|]
 ////var t = [|area|](10);
 
-const [r0, r1, r2] = test.ranges();
+const [r0Def, r0, r1Def, r1, r2] = test.ranges();
 verify.renameLocations(r0, [r0, r1, r2]);
 verify.renameLocations([r1, r2], [{ range: r1, prefixText: "area as " }, r2]);
diff --git a/tests/cases/fourslash/renameDefaultImport.ts b/tests/cases/fourslash/renameDefaultImport.ts
index a3a698ec4c4..9c2a2d67dc1 100644
--- a/tests/cases/fourslash/renameDefaultImport.ts
+++ b/tests/cases/fourslash/renameDefaultImport.ts
@@ -1,26 +1,25 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: B.ts
-////export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true |}B|] {
+////[|export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}B|] {
 ////    test() {
 ////    }
-////}
+////}|]
 
 // @Filename: A.ts
-////import [|{| "isWriteAccess": true, "isDefinition": true |}B|] from "./B";
+////[|import [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}B|] from "./B";|]
 ////let b = new [|B|]();
 ////b.test();
 
 goTo.marker("1");
 verify.occurrencesAtPositionCount(1);
 
-const ranges = test.ranges();
-const [C, B0, B1] = ranges;
+const [CDef, C, B0Def, B0, B1] = test.ranges();;
 
 const classes = { definition: "class B", ranges: [C] };
 const imports = { definition: "(alias) class B\nimport B", ranges: [B0, B1] };
 verify.referenceGroups(C, [classes, imports]);
 verify.referenceGroups([B0, B1], [imports, classes]);
 
-verify.renameLocations(C, ranges);
+verify.renameLocations(C, [C, B0, B1]);
 verify.rangesAreRenameLocations([B0, B1]);
diff --git a/tests/cases/fourslash/renameDefaultImportDifferentName.ts b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
index 11473ade501..8c05efe3add 100644
--- a/tests/cases/fourslash/renameDefaultImportDifferentName.ts
+++ b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
@@ -1,21 +1,20 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: B.ts
-////export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true |}C|] {
+////[|export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}C|] {
 ////    test() {
 ////    }
-////}
+////}|]
 
 // @Filename: A.ts
-////import [|{| "isWriteAccess": true, "isDefinition": true |}B|] from "./B";
+////[|import [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}B|] from "./B";|]
 ////let b = new [|B|]();
 ////b.test();
 
 goTo.marker("1");
 verify.occurrencesAtPositionCount(1);
 
-const ranges = test.ranges();
-const [C, B0, B1] = ranges;
+const [CDef, C, B0Def, B0, B1] = test.ranges();
 const bRanges = [B0, B1];
 const classes = { definition: "class C", ranges: [C] };
 const imports = { definition: "(alias) class B\nimport B", ranges: [B0, B1] };
diff --git a/tests/cases/fourslash/renameDefaultLibDontWork.ts b/tests/cases/fourslash/renameDefaultLibDontWork.ts
index 5d2cfb43eb4..02d7e1d19ea 100644
--- a/tests/cases/fourslash/renameDefaultLibDontWork.ts
+++ b/tests/cases/fourslash/renameDefaultLibDontWork.ts
@@ -4,8 +4,8 @@
 // "test" is a comment on the default library.
 
 // @Filename: file1.ts
-//// var [|test|] = "foo";
+//// [|var [|{| "declarationRangeIndex": 0 |}test|] = "foo";|]
 //// console.log([|test|]);
 
-const ranges = test.ranges();
+const [r0Def, ...ranges] = test.ranges();
 verify.renameLocations(ranges[0], { findInComments: true, ranges });
\ No newline at end of file