diff --git a/tests/baselines/reference/yieldExpressionInFlowLoop.js b/tests/baselines/reference/yieldExpressionInFlowLoop.js
new file mode 100644
index 00000000000..d58c2857a00
--- /dev/null
+++ b/tests/baselines/reference/yieldExpressionInFlowLoop.js
@@ -0,0 +1,16 @@
+//// [yieldExpressionInFlowLoop.ts]
+function* f() {
+    let result;
+    while (1) {
+        result = yield result;
+    }
+}
+
+
+//// [yieldExpressionInFlowLoop.js]
+function* f() {
+    let result;
+    while (1) {
+        result = yield result;
+    }
+}
diff --git a/tests/baselines/reference/yieldExpressionInFlowLoop.symbols b/tests/baselines/reference/yieldExpressionInFlowLoop.symbols
new file mode 100644
index 00000000000..d2c2aaffba0
--- /dev/null
+++ b/tests/baselines/reference/yieldExpressionInFlowLoop.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/yieldExpressionInFlowLoop.ts ===
+function* f() {
+>f : Symbol(f, Decl(yieldExpressionInFlowLoop.ts, 0, 0))
+
+    let result;
+>result : Symbol(result, Decl(yieldExpressionInFlowLoop.ts, 1, 7))
+
+    while (1) {
+        result = yield result;
+>result : Symbol(result, Decl(yieldExpressionInFlowLoop.ts, 1, 7))
+>result : Symbol(result, Decl(yieldExpressionInFlowLoop.ts, 1, 7))
+    }
+}
+
diff --git a/tests/baselines/reference/yieldExpressionInFlowLoop.types b/tests/baselines/reference/yieldExpressionInFlowLoop.types
new file mode 100644
index 00000000000..a178d4b5ce7
--- /dev/null
+++ b/tests/baselines/reference/yieldExpressionInFlowLoop.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/yieldExpressionInFlowLoop.ts ===
+function* f() {
+>f : () => IterableIterator<any>
+
+    let result;
+>result : any
+
+    while (1) {
+>1 : 1
+
+        result = yield result;
+>result = yield result : any
+>result : any
+>yield result : any
+>result : any
+    }
+}
+
diff --git a/tests/cases/compiler/yieldExpressionInFlowLoop.ts b/tests/cases/compiler/yieldExpressionInFlowLoop.ts
new file mode 100644
index 00000000000..43d0895f9ef
--- /dev/null
+++ b/tests/cases/compiler/yieldExpressionInFlowLoop.ts
@@ -0,0 +1,9 @@
+// @noImplicitAny: true
+// @target: es6
+
+function* f() {
+    let result;
+    while (1) {
+        result = yield result;
+    }
+}