diff --git a/tests/cases/fourslash/completionListInExportClause01.ts b/tests/cases/fourslash/completionListInExportClause01.ts
new file mode 100644
index 00000000000..6e6cd6c678b
--- /dev/null
+++ b/tests/cases/fourslash/completionListInExportClause01.ts
@@ -0,0 +1,39 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: m1.ts
+////export var foo: number = 1;
+////export function bar() { return 10; }
+////export function baz() { return 10; }
+
+// @Filename: m2.ts
+////export {/*1*/, /*2*/ from "m1"
+////export {/*3*/} from "m1"
+////export {foo,/*4*/ from "m1"
+////export {bar as /*5*/, /*6*/ from "m1"
+////export {foo, bar, baz as b,/*7*/} from "m1"
+function verifyCompletionAtMarker(marker: string, showBuilder: boolean, ...completions: string[]) {
+    goTo.marker(marker);
+    if (completions.length) {
+        for (let completion of completions) {
+            verify.completionListContains(completion);
+        }
+    }
+    else {
+        verify.completionListIsEmpty();
+    }
+
+    if (showBuilder) {
+        verify.completionListAllowsNewIdentifier();
+    }
+    else {
+        verify.not.completionListAllowsNewIdentifier();
+    }
+}
+
+verifyCompletionAtMarker("1", /*showBuilder*/ false, "foo", "bar", "baz");
+verifyCompletionAtMarker("2", /*showBuilder*/ false, "foo", "bar", "baz");
+verifyCompletionAtMarker("3", /*showBuilder*/ false, "foo", "bar", "baz");
+verifyCompletionAtMarker("4", /*showBuilder*/ false, "bar", "baz");
+verifyCompletionAtMarker("5", /*showBuilder*/ true);
+verifyCompletionAtMarker("6", /*showBuilder*/ false, "foo", "baz");
+verifyCompletionAtMarker("7", /*showBuilder*/ false);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInExportClause02.ts b/tests/cases/fourslash/completionListInExportClause02.ts
new file mode 100644
index 00000000000..4b40976f521
--- /dev/null
+++ b/tests/cases/fourslash/completionListInExportClause02.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////declare module "M1" {
+////    export var V;
+////}
+////var W;
+////declare module "M2" {
+////    export { /**/ } from "M1"
+////}
+
+goTo.marker();
+verify.completionListContains("V");
+verify.not.completionListContains("W");
+verify.not.completionListAllowsNewIdentifier();
\ No newline at end of file