diff --git a/tests/cases/fourslash/completionForTripleSlashReference1.ts b/tests/cases/fourslash/completionForTripleSlashReference1.ts
deleted file mode 100644
index 2ce4de2e72e..00000000000
--- a/tests/cases/fourslash/completionForTripleSlashReference1.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// Should give completions for relative references to ts files when allowJs is false
-
-// @Filename: test0.ts
-//// /// <reference path="/*0*/
-//// /// <reference path="./*1*/
-//// /// <reference path="../*2*/
-//// /// <reference path=".//*3*/
-//// /// <reference path="./f/*4*/" />
-//// /// <reference path="./parentTest//*5*/
-
-// @Filename: parentTest/sub/test1.ts
-//// /// <reference path="../g/*6*/
-
-// @Filename: f1.ts
-//// /*f1*/
-// @Filename: f1.js
-//// /*f1j*/
-// @Filename: f1.d.ts
-//// /*f1d*/
-// @Filename: f2.tsx
-//// /f2*/
-// @Filename: f3.js
-//// /*f3*/
-// @Filename: f4.jsx
-//// /*f4*/
-// @Filename: e1.ts
-//// /*e1*/
-// @Filename: parentTest/g1.ts
-//// /*parentg1*/
-
-for (let i = 0; i < 5; i++) {
-    goTo.marker("" + i);
-    verify.completionListContains("f1.ts");
-    verify.completionListContains("f1.d.ts");
-    verify.completionListContains("f2.tsx");
-    verify.completionListContains("e1.ts");
-    verify.completionListContains("parentTest");
-    verify.not.completionListItemsCountIsGreaterThan(5);
-}
-
-goTo.marker("5");
-verify.completionListContains("g1.ts");
-verify.completionListContains("sub");
-verify.not.completionListItemsCountIsGreaterThan(2);
-
-goTo.marker("6");
-verify.completionListContains("g1.ts");
-verify.completionListContains("sub");
-verify.not.completionListItemsCountIsGreaterThan(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference3.ts b/tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts
similarity index 100%
rename from tests/cases/fourslash/completionForTripleSlashReference3.ts
rename to tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
new file mode 100644
index 00000000000..91b84bc699d
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
@@ -0,0 +1,37 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises relative path completions going up and down 2 directories
+// and the use of forward- and back-slashes and combinations thereof.
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.ts
+//// /*f2*/
+// @Filename: d/g.ts
+//// /*g*/
+
+// @Filename: test.ts
+//// /// <reference path="f/*0*/
+//// /// <reference path="./f/*1*/
+
+//// /// <reference path="f1/*2*/
+//// /// <reference path="f1./*3*/
+//// /// <reference path="f1.t/*4*/
+//// /// <reference path="f1.ts/*5*/
+//// /// <reference path="./f1/*6*/
+//// /// <reference path="./f1./*7*/
+//// /// <reference path="./f1.t/*8*/
+//// /// <reference path="./f1.ts/*9*/
+
+for (let m of ["0", "1"]) {
+    goTo.marker(m);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f2.ts");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
+
+for (let m = 2; m < 10; ++m) {
+    goTo.marker("" + m);
+    verify.completionListContains("f1.ts");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
deleted file mode 100644
index 67fd8ee25e2..00000000000
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// Exercises relative path completions going up and down 2 directories
-// and the use of forward- and back-slashes and combinations thereof.
-
-// @Filename: f1.ts
-//// /*f1*/
-// @Filename: f2.ts
-//// /*f2*/
-
-// @Filename: test.ts
-//// /// <reference path="f/*0*/
-//// /// <reference path="f1/*1*/
-//// /// <reference path="f1./*2*/
-//// /// <reference path="f1.t/*3*/
-
-//// /// <reference path="./f/*4*/
-//// /// <reference path="./f1/*5*/
-//// /// <reference path="./f1./*6*/
-//// /// <reference path="./f1.t/*7*/
-
diff --git a/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts
new file mode 100644
index 00000000000..2ca68befe25
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts
@@ -0,0 +1,31 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for relative references to ts files when allowJs is false
+
+// @Filename: test0.ts
+//// /// <reference path="/*0*/
+//// /// <reference path=".//*1*/
+//// /// <reference path="./f/*2*/
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f1.js
+//// /*f1j*/
+// @Filename: f1.d.ts
+//// /*f1d*/
+// @Filename: f1.tsx
+//// /f2*/
+// @Filename: f1.js
+//// /*f3*/
+// @Filename: f1.jsx
+//// /*f4*/
+// @Filename: f1.cs
+//// /*f5*/
+
+for (let i = 0; i < 3; i++) {
+    goTo.marker("" + i);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f1.d.ts");
+    verify.completionListContains("f1.tsx");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference2.ts b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
similarity index 53%
rename from tests/cases/fourslash/completionForTripleSlashReference2.ts
rename to tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
index e6553ce8e73..2f574b9eaf4 100644
--- a/tests/cases/fourslash/completionForTripleSlashReference2.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
@@ -1,15 +1,13 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for relative references to js and ts files when allowJs is true
+// Should give completions for relative references to ts files when allowJs is false
 
 // @allowJs: true
 
 // @Filename: test0.ts
 //// /// <reference path="/*0*/
-//// /// <reference path="./*1*/
-//// /// <reference path="../*2*/
-//// /// <reference path=".//*3*/
-//// /// <reference path="./f/*4*/" />
+//// /// <reference path=".//*1*/
+//// /// <reference path="./f/*2*/
 
 // @Filename: f1.ts
 //// /*f1*/
@@ -17,17 +15,21 @@
 //// /*f1j*/
 // @Filename: f1.d.ts
 //// /*f1d*/
-// @Filename: f2.tsx
+// @Filename: f1.tsx
 //// /f2*/
-// @Filename: f4.jsx
+// @Filename: f1.js
+//// /*f3*/
+// @Filename: f1.jsx
 //// /*f4*/
+// @Filename: f1.cs
+//// /*f5*/
 
-for (let i = 0; i < 5; i++) {
+for (let i = 0; i < 3; i++) {
     goTo.marker("" + i);
     verify.completionListContains("f1.ts");
-    verify.completionListContains("f1.js");
     verify.completionListContains("f1.d.ts");
-    verify.completionListContains("f2.tsx");
-    verify.completionListContains("f4.jsx");
+    verify.completionListContains("f1.tsx");
+    verify.completionListContains("f1.js");
+    verify.completionListContains("f1.jsx");
     verify.not.completionListItemsCountIsGreaterThan(5);
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference4.ts b/tests/cases/fourslash/tripleSlashRefPathRootdirs.ts
similarity index 100%
rename from tests/cases/fourslash/completionForTripleSlashReference4.ts
rename to tests/cases/fourslash/tripleSlashRefPathRootdirs.ts