diff --git a/tests/cases/fourslash/completionListInUnclosedCommaExpression01.ts b/tests/cases/fourslash/completionListInUnclosedCommaExpression01.ts
new file mode 100644
index 00000000000..de0f26eb86e
--- /dev/null
+++ b/tests/cases/fourslash/completionListInUnclosedCommaExpression01.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+////// should NOT see a and b
+////foo((a, b) => a,/*1*/
+
+goTo.marker("1");
+verify.not.completionListContains("a");
+verify.not.completionListContains("b");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedCommaExpression02.ts b/tests/cases/fourslash/completionListInUnclosedCommaExpression02.ts
new file mode 100644
index 00000000000..e0ea3abbd38
--- /dev/null
+++ b/tests/cases/fourslash/completionListInUnclosedCommaExpression02.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+////// should NOT see a and b
+////foo((a, b) => (a,/*1*/
+
+goTo.marker("1");
+verify.completionListContains("a");
+verify.completionListContains("b");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedForLoop01.ts b/tests/cases/fourslash/completionListInUnclosedForLoop01.ts
new file mode 100644
index 00000000000..35e5efdd304
--- /dev/null
+++ b/tests/cases/fourslash/completionListInUnclosedForLoop01.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+////for (let i = 0; /*1*/
+
+goTo.marker("1");
+verify.completionListContains("i");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedForLoop02.ts b/tests/cases/fourslash/completionListInUnclosedForLoop02.ts
new file mode 100644
index 00000000000..e79f428b2b0
--- /dev/null
+++ b/tests/cases/fourslash/completionListInUnclosedForLoop02.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+////for (let i = 0; i < 10; i++) /*1*/
+
+goTo.marker("1");
+verify.completionListContains("i");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListOutsideOfClosedArrowFunction01.ts b/tests/cases/fourslash/completionListOutsideOfClosedArrowFunction01.ts
new file mode 100644
index 00000000000..d775371796f
--- /dev/null
+++ b/tests/cases/fourslash/completionListOutsideOfClosedArrowFunction01.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+////// no a or b
+/////*1*/(a, b) => { }
+
+goTo.marker("1");
+verify.not.completionListContains("a");
+verify.not.completionListContains("b");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListOutsideOfClosedArrowFunction02.ts b/tests/cases/fourslash/completionListOutsideOfClosedArrowFunction02.ts
new file mode 100644
index 00000000000..d9195ce5b97
--- /dev/null
+++ b/tests/cases/fourslash/completionListOutsideOfClosedArrowFunction02.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+////// no a or b
+////(a, b) => { }/*1*/
+
+goTo.marker("1");
+verify.not.completionListContains("a");
+verify.not.completionListContains("b");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListOutsideOfClosedFunctionDeclaration01.ts b/tests/cases/fourslash/completionListOutsideOfClosedFunctionDeclaration01.ts
new file mode 100644
index 00000000000..8b6077e0f8b
--- /dev/null
+++ b/tests/cases/fourslash/completionListOutsideOfClosedFunctionDeclaration01.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+////// no a or b
+/////*1*/function f (a, b) {}
+
+goTo.marker("1");
+verify.not.completionListContains("a");
+verify.not.completionListContains("b");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListOutsideOfForLoop01.ts b/tests/cases/fourslash/completionListOutsideOfForLoop01.ts
new file mode 100644
index 00000000000..473a39a453d
--- /dev/null
+++ b/tests/cases/fourslash/completionListOutsideOfForLoop01.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+////for (let i = 0; i < 10; i++) i;/*1*/
+
+goTo.marker("1");
+verify.not.completionListContains("i");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListOutsideOfForLoop02.ts b/tests/cases/fourslash/completionListOutsideOfForLoop02.ts
new file mode 100644
index 00000000000..b1186ac7cce
--- /dev/null
+++ b/tests/cases/fourslash/completionListOutsideOfForLoop02.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+////for (let i = 0; i < 10; i++);/*1*/
+
+goTo.marker("1");
+verify.not.completionListContains("i");
\ No newline at end of file