diff --git a/tests/cases/fourslash/tsxCompletion11.ts b/tests/cases/fourslash/tsxCompletion11.ts
deleted file mode 100644
index 70626a84791..00000000000
--- a/tests/cases/fourslash/tsxCompletion11.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// var x1 = </**/
-
-goTo.marker();
-verify.memberListCount(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion13.ts b/tests/cases/fourslash/tsxCompletion13.ts
deleted file mode 100644
index 426ce90d258..00000000000
--- a/tests/cases/fourslash/tsxCompletion13.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// class MyElement {}
-//// var x1 = <My/**/
-
-goTo.marker("");
-verify.memberListCount(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion14.ts b/tests/cases/fourslash/tsxCompletion14.ts
deleted file mode 100644
index 426ce90d258..00000000000
--- a/tests/cases/fourslash/tsxCompletion14.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// class MyElement {}
-//// var x1 = <My/**/
-
-goTo.marker("");
-verify.memberListCount(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion15.ts b/tests/cases/fourslash/tsxCompletion15.ts
deleted file mode 100644
index 6065eba8490..00000000000
--- a/tests/cases/fourslash/tsxCompletion15.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// class MyElement {}
-//// var x1 = <MyElement></My/**/
-
-goTo.marker("");
-verify.memberListCount(1);
-verify.completionListContains('MyElement');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion16.ts b/tests/cases/fourslash/tsxCompletion16.ts
deleted file mode 100644
index 96ec89f26b8..00000000000
--- a/tests/cases/fourslash/tsxCompletion16.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// var x1 = </**/
-
-goTo.marker("");
-verify.memberListCount(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion17.ts b/tests/cases/fourslash/tsxCompletion17.ts
deleted file mode 100644
index bec17956267..00000000000
--- a/tests/cases/fourslash/tsxCompletion17.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// var x1 = <MyElement></My/**/
-
-goTo.marker("");
-verify.memberListCount(1);
-verify.completionListContains('MyElement');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion18.ts b/tests/cases/fourslash/tsxCompletion18.ts
deleted file mode 100644
index 351b576d32c..00000000000
--- a/tests/cases/fourslash/tsxCompletion18.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//@Filename: file.tsx
-//// var x = <div> 
-////        <h1> </ /*1*/>
-////        <d/*3*/iv> </ /*4*/>
-////        <d/*5*/iv> </ /*6*/>
-////        </ /*2*/>
-
-goTo.marker("1");
-verify.memberListCount(1);
-verify.completionListContains('h1');
-
-goTo.marker("2");
-verify.memberListCount(1);
-verify.completionListContains('div');
-
-goTo.marker("3");
-verify.memberListCount(0);
-
-goTo.marker("4");
-verify.memberListCount(1);
-verify.completionListContains('div');
-
-goTo.marker("5");
-verify.memberListCount(0);
-
-goTo.marker("6");
-verify.memberListCount(1);
-verify.completionListContains('div');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion12.ts b/tests/cases/fourslash/tsxCompletionOnClosingTag1.ts
similarity index 100%
rename from tests/cases/fourslash/tsxCompletion12.ts
rename to tests/cases/fourslash/tsxCompletionOnClosingTag1.ts
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts b/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts
new file mode 100644
index 00000000000..54a0b61879f
--- /dev/null
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: file.tsx
+//// declare module JSX {
+////     interface Element { }
+////     interface IntrinsicElements {
+////         div: { ONE: string; TWO: number; }
+////     }
+//// }
+//// var x1 = <div><//**/
+
+goTo.marker();
+verify.memberListCount(1);
+verify.completionListContains('div');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTag3.ts b/tests/cases/fourslash/tsxCompletionOnClosingTag3.ts
new file mode 100644
index 00000000000..80d2b0c00ba
--- /dev/null
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTag3.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: file.tsx
+//// declare module JSX {
+////     interface Element { }
+////     interface IntrinsicElements {
+////         div: { ONE: string; TWO: number; }
+////     }
+//// }
+//// var x1 = <div>
+////    <h1> Hello world </ /*2*/>
+////    </ /* 1 * />
+
+goTo.marker("1");
+verify.memberListCount(1);
+verify.completionListContains('div');
+
+goTo.marker("2");
+verify.memberListCount(1);
+verify.completionListContains('h1')
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTag4.ts b/tests/cases/fourslash/tsxCompletionOnClosingTag4.ts
new file mode 100644
index 00000000000..a36a933127d
--- /dev/null
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTag4.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: file.tsx
+//// var x1 = <div>
+////    <h1> Hello world </ /*2*/>
+////    </ /* 1 * />
+
+goTo.marker("1");
+verify.memberListCount(1);
+verify.completionListContains('div');
+
+goTo.marker("2");
+verify.memberListCount(1);
+verify.completionListContains('h1')