diff --git a/tests/baselines/reference/forAwait.1.es2017.errors.txt b/tests/baselines/reference/forAwait.1.es2017.errors.txt
new file mode 100644
index 00000000000..0e07b085ee8
--- /dev/null
+++ b/tests/baselines/reference/forAwait.1.es2017.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es2017/forAwait/forAwait.1.es2017.ts(2,5): error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+
+
+==== tests/cases/conformance/es2017/forAwait/forAwait.1.es2017.ts (1 errors) ====
+    declare const ai: AsyncIterable<number>;
+    for await (const x of ai) {
+        ~~~~~
+!!! error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/forAwait.1.es2017.js b/tests/baselines/reference/forAwait.1.es2017.js
new file mode 100644
index 00000000000..ca70789ecaf
--- /dev/null
+++ b/tests/baselines/reference/forAwait.1.es2017.js
@@ -0,0 +1,8 @@
+//// [forAwait.1.es2017.ts]
+declare const ai: AsyncIterable<number>;
+for await (const x of ai) {
+}
+
+//// [forAwait.1.es2017.js]
+for await (const x of ai) {
+}
diff --git a/tests/baselines/reference/forAwait.2.es2017.errors.txt b/tests/baselines/reference/forAwait.2.es2017.errors.txt
new file mode 100644
index 00000000000..206893b4069
--- /dev/null
+++ b/tests/baselines/reference/forAwait.2.es2017.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es2017/forAwait/forAwait.2.es2017.ts(3,9): error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+
+
+==== tests/cases/conformance/es2017/forAwait/forAwait.2.es2017.ts (1 errors) ====
+    declare const ai: AsyncIterable<number>;
+    function f() {
+        for await (const x of ai) {
+            ~~~~~
+!!! error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/forAwait.2.es2017.js b/tests/baselines/reference/forAwait.2.es2017.js
new file mode 100644
index 00000000000..3f3fbb68f04
--- /dev/null
+++ b/tests/baselines/reference/forAwait.2.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.2.es2017.ts]
+declare const ai: AsyncIterable<number>;
+function f() {
+    for await (const x of ai) {
+    }
+}
+
+//// [forAwait.2.es2017.js]
+function f() {
+    for await (const x of ai) {
+    }
+}
diff --git a/tests/baselines/reference/forAwait.3.es2017.js b/tests/baselines/reference/forAwait.3.es2017.js
new file mode 100644
index 00000000000..0ac59e783e2
--- /dev/null
+++ b/tests/baselines/reference/forAwait.3.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.3.es2017.ts]
+declare const ai: AsyncIterable<number>;
+async function f() {
+    for await (const x of ai) {
+    }
+}
+
+//// [forAwait.3.es2017.js]
+async function f() {
+    for await (const x of ai) {
+    }
+}
diff --git a/tests/baselines/reference/forAwait.3.es2017.symbols b/tests/baselines/reference/forAwait.3.es2017.symbols
new file mode 100644
index 00000000000..9a01ffa6760
--- /dev/null
+++ b/tests/baselines/reference/forAwait.3.es2017.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.3.es2017.ts ===
+declare const ai: AsyncIterable<number>;
+>ai : Symbol(ai, Decl(forAwait.3.es2017.ts, 0, 13))
+>AsyncIterable : Symbol(AsyncIterable, Decl(lib.es2017.asynciterable.d.ts, --, --))
+
+async function f() {
+>f : Symbol(f, Decl(forAwait.3.es2017.ts, 0, 40))
+
+    for await (const x of ai) {
+>x : Symbol(x, Decl(forAwait.3.es2017.ts, 2, 20))
+>ai : Symbol(ai, Decl(forAwait.3.es2017.ts, 0, 13))
+    }
+}
diff --git a/tests/baselines/reference/forAwait.3.es2017.types b/tests/baselines/reference/forAwait.3.es2017.types
new file mode 100644
index 00000000000..665dbd252f6
--- /dev/null
+++ b/tests/baselines/reference/forAwait.3.es2017.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.3.es2017.ts ===
+declare const ai: AsyncIterable<number>;
+>ai : AsyncIterable<number>
+>AsyncIterable : AsyncIterable<T>
+
+async function f() {
+>f : () => Promise<void>
+
+    for await (const x of ai) {
+>x : number
+>ai : AsyncIterable<number>
+    }
+}
diff --git a/tests/baselines/reference/forAwait.4.es2017.js b/tests/baselines/reference/forAwait.4.es2017.js
new file mode 100644
index 00000000000..13b3c87a926
--- /dev/null
+++ b/tests/baselines/reference/forAwait.4.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.4.es2017.ts]
+declare const i: Iterable<number>;
+async function f() {
+    for await (const x of i) {
+    }
+}
+
+//// [forAwait.4.es2017.js]
+async function f() {
+    for await (const x of i) {
+    }
+}
diff --git a/tests/baselines/reference/forAwait.4.es2017.symbols b/tests/baselines/reference/forAwait.4.es2017.symbols
new file mode 100644
index 00000000000..588ede4aeba
--- /dev/null
+++ b/tests/baselines/reference/forAwait.4.es2017.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.4.es2017.ts ===
+declare const i: Iterable<number>;
+>i : Symbol(i, Decl(forAwait.4.es2017.ts, 0, 13))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
+
+async function f() {
+>f : Symbol(f, Decl(forAwait.4.es2017.ts, 0, 34))
+
+    for await (const x of i) {
+>x : Symbol(x, Decl(forAwait.4.es2017.ts, 2, 20))
+>i : Symbol(i, Decl(forAwait.4.es2017.ts, 0, 13))
+    }
+}
diff --git a/tests/baselines/reference/forAwait.4.es2017.types b/tests/baselines/reference/forAwait.4.es2017.types
new file mode 100644
index 00000000000..c39dccbb0c3
--- /dev/null
+++ b/tests/baselines/reference/forAwait.4.es2017.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.4.es2017.ts ===
+declare const i: Iterable<number>;
+>i : Iterable<number>
+>Iterable : Iterable<T>
+
+async function f() {
+>f : () => Promise<void>
+
+    for await (const x of i) {
+>x : number
+>i : Iterable<number>
+    }
+}
diff --git a/tests/baselines/reference/forAwait.5.es2017.js b/tests/baselines/reference/forAwait.5.es2017.js
new file mode 100644
index 00000000000..3985c8fdb82
--- /dev/null
+++ b/tests/baselines/reference/forAwait.5.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.5.es2017.ts]
+declare const ai: AsyncIterable<number>;
+async function* f() {
+    for await (const x of ai) {
+    }
+}
+
+//// [forAwait.5.es2017.js]
+async function* f() {
+    for await (const x of ai) {
+    }
+}
diff --git a/tests/baselines/reference/forAwait.5.es2017.symbols b/tests/baselines/reference/forAwait.5.es2017.symbols
new file mode 100644
index 00000000000..628160cb411
--- /dev/null
+++ b/tests/baselines/reference/forAwait.5.es2017.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.5.es2017.ts ===
+declare const ai: AsyncIterable<number>;
+>ai : Symbol(ai, Decl(forAwait.5.es2017.ts, 0, 13))
+>AsyncIterable : Symbol(AsyncIterable, Decl(lib.es2017.asynciterable.d.ts, --, --))
+
+async function* f() {
+>f : Symbol(f, Decl(forAwait.5.es2017.ts, 0, 40))
+
+    for await (const x of ai) {
+>x : Symbol(x, Decl(forAwait.5.es2017.ts, 2, 20))
+>ai : Symbol(ai, Decl(forAwait.5.es2017.ts, 0, 13))
+    }
+}
diff --git a/tests/baselines/reference/forAwait.5.es2017.types b/tests/baselines/reference/forAwait.5.es2017.types
new file mode 100644
index 00000000000..22a68e70949
--- /dev/null
+++ b/tests/baselines/reference/forAwait.5.es2017.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.5.es2017.ts ===
+declare const ai: AsyncIterable<number>;
+>ai : AsyncIterable<number>
+>AsyncIterable : AsyncIterable<T>
+
+async function* f() {
+>f : () => AsyncIterableIterator<any>
+
+    for await (const x of ai) {
+>x : number
+>ai : AsyncIterable<number>
+    }
+}
diff --git a/tests/baselines/reference/forAwait.6.es2017.js b/tests/baselines/reference/forAwait.6.es2017.js
new file mode 100644
index 00000000000..631abb80e9a
--- /dev/null
+++ b/tests/baselines/reference/forAwait.6.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.6.es2017.ts]
+declare const i: Iterable<number>;
+async function* f() {
+    for await (const x of i) {
+    }
+}
+
+//// [forAwait.6.es2017.js]
+async function* f() {
+    for await (const x of i) {
+    }
+}
diff --git a/tests/baselines/reference/forAwait.6.es2017.symbols b/tests/baselines/reference/forAwait.6.es2017.symbols
new file mode 100644
index 00000000000..a7e1bc9a7ef
--- /dev/null
+++ b/tests/baselines/reference/forAwait.6.es2017.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.6.es2017.ts ===
+declare const i: Iterable<number>;
+>i : Symbol(i, Decl(forAwait.6.es2017.ts, 0, 13))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
+
+async function* f() {
+>f : Symbol(f, Decl(forAwait.6.es2017.ts, 0, 34))
+
+    for await (const x of i) {
+>x : Symbol(x, Decl(forAwait.6.es2017.ts, 2, 20))
+>i : Symbol(i, Decl(forAwait.6.es2017.ts, 0, 13))
+    }
+}
diff --git a/tests/baselines/reference/forAwait.6.es2017.types b/tests/baselines/reference/forAwait.6.es2017.types
new file mode 100644
index 00000000000..307a4ba8df5
--- /dev/null
+++ b/tests/baselines/reference/forAwait.6.es2017.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/es2017/forAwait/forAwait.6.es2017.ts ===
+declare const i: Iterable<number>;
+>i : Iterable<number>
+>Iterable : Iterable<T>
+
+async function* f() {
+>f : () => AsyncIterableIterator<any>
+
+    for await (const x of i) {
+>x : number
+>i : Iterable<number>
+    }
+}
diff --git a/tests/baselines/reference/forAwait.7.es2017.errors.txt b/tests/baselines/reference/forAwait.7.es2017.errors.txt
new file mode 100644
index 00000000000..960585d5cf4
--- /dev/null
+++ b/tests/baselines/reference/forAwait.7.es2017.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es2017/forAwait/forAwait.7.es2017.ts(3,9): error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+
+
+==== tests/cases/conformance/es2017/forAwait/forAwait.7.es2017.ts (1 errors) ====
+    declare const ai: AsyncIterable<number>;
+    function* f() {
+        for await (const x of ai) {
+            ~~~~~
+!!! error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/forAwait.7.es2017.js b/tests/baselines/reference/forAwait.7.es2017.js
new file mode 100644
index 00000000000..a9bdbade786
--- /dev/null
+++ b/tests/baselines/reference/forAwait.7.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.7.es2017.ts]
+declare const ai: AsyncIterable<number>;
+function* f() {
+    for await (const x of ai) {
+    }
+}
+
+//// [forAwait.7.es2017.js]
+function* f() {
+    for await (const x of ai) {
+    }
+}
diff --git a/tests/baselines/reference/forAwait.8.es2017.errors.txt b/tests/baselines/reference/forAwait.8.es2017.errors.txt
new file mode 100644
index 00000000000..db9e582ab20
--- /dev/null
+++ b/tests/baselines/reference/forAwait.8.es2017.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es2017/forAwait/forAwait.8.es2017.ts(3,9): error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+
+
+==== tests/cases/conformance/es2017/forAwait/forAwait.8.es2017.ts (1 errors) ====
+    declare const i: Iterable<number>;
+    function* f() {
+        for await (const x of i) {
+            ~~~~~
+!!! error TS1104: A 'for-await-of' statement is only allowed within an async function or async generator.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/forAwait.8.es2017.js b/tests/baselines/reference/forAwait.8.es2017.js
new file mode 100644
index 00000000000..1657a002b69
--- /dev/null
+++ b/tests/baselines/reference/forAwait.8.es2017.js
@@ -0,0 +1,12 @@
+//// [forAwait.8.es2017.ts]
+declare const i: Iterable<number>;
+function* f() {
+    for await (const x of i) {
+    }
+}
+
+//// [forAwait.8.es2017.js]
+function* f() {
+    for await (const x of i) {
+    }
+}
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.1.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.1.es2017.ts
new file mode 100644
index 00000000000..b990014fd9a
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.1.es2017.ts
@@ -0,0 +1,4 @@
+// @target: es2017
+declare const ai: AsyncIterable<number>;
+for await (const x of ai) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.2.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.2.es2017.ts
new file mode 100644
index 00000000000..65d96435093
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.2.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const ai: AsyncIterable<number>;
+function f() {
+    for await (const x of ai) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.3.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.3.es2017.ts
new file mode 100644
index 00000000000..9c18a0bfd38
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.3.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const ai: AsyncIterable<number>;
+async function f() {
+    for await (const x of ai) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.4.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.4.es2017.ts
new file mode 100644
index 00000000000..72ac5ab2eb4
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.4.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const i: Iterable<number>;
+async function f() {
+    for await (const x of i) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.5.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.5.es2017.ts
new file mode 100644
index 00000000000..b75ad2e152d
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.5.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const ai: AsyncIterable<number>;
+async function* f() {
+    for await (const x of ai) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.6.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.6.es2017.ts
new file mode 100644
index 00000000000..2b23da30918
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.6.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const i: Iterable<number>;
+async function* f() {
+    for await (const x of i) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.7.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.7.es2017.ts
new file mode 100644
index 00000000000..69c4fb75b38
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.7.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const ai: AsyncIterable<number>;
+function* f() {
+    for await (const x of ai) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es2017/forAwait/forAwait.8.es2017.ts b/tests/cases/conformance/es2017/forAwait/forAwait.8.es2017.ts
new file mode 100644
index 00000000000..b489b39b1d4
--- /dev/null
+++ b/tests/cases/conformance/es2017/forAwait/forAwait.8.es2017.ts
@@ -0,0 +1,6 @@
+// @target: es2017
+declare const i: Iterable<number>;
+function* f() {
+    for await (const x of i) {
+    }
+}
\ No newline at end of file