diff --git a/tests/baselines/reference/YieldStarExpression1_es6.errors.txt b/tests/baselines/reference/YieldStarExpression1_es6.errors.txt
new file mode 100644
index 00000000000..9ba5e44f9aa
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression1_es6.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression1_es6.ts(1,1): error TS2304: Cannot find name 'yield'.
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression1_es6.ts(1,9): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldStarExpression1_es6.ts (2 errors) ====
+    yield * [];
+    ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+            ~~
+!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldStarExpression1_es6.js b/tests/baselines/reference/YieldStarExpression1_es6.js
new file mode 100644
index 00000000000..742c5b7d1e7
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression1_es6.js
@@ -0,0 +1,5 @@
+//// [YieldStarExpression1_es6.ts]
+yield * [];
+
+//// [YieldStarExpression1_es6.js]
+yield * [];
diff --git a/tests/baselines/reference/YieldStarExpression2_es6.errors.txt b/tests/baselines/reference/YieldStarExpression2_es6.errors.txt
new file mode 100644
index 00000000000..3d0c89fd23f
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression2_es6.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression2_es6.ts(1,1): error TS2304: Cannot find name 'yield'.
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression2_es6.ts(1,8): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldStarExpression2_es6.ts (2 errors) ====
+    yield *;
+    ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+           ~
+!!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldStarExpression2_es6.js b/tests/baselines/reference/YieldStarExpression2_es6.js
new file mode 100644
index 00000000000..5b40963d9a2
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression2_es6.js
@@ -0,0 +1,5 @@
+//// [YieldStarExpression2_es6.ts]
+yield *;
+
+//// [YieldStarExpression2_es6.js]
+yield * ;
diff --git a/tests/baselines/reference/YieldStarExpression3_es6.errors.txt b/tests/baselines/reference/YieldStarExpression3_es6.errors.txt
new file mode 100644
index 00000000000..25cecc80444
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression3_es6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression3_es6.ts(2,12): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldStarExpression3_es6.ts (1 errors) ====
+    function *g() {
+        yield *;
+               ~
+!!! error TS1109: Expression expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldStarExpression3_es6.js b/tests/baselines/reference/YieldStarExpression3_es6.js
new file mode 100644
index 00000000000..7463fc01bc1
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression3_es6.js
@@ -0,0 +1,9 @@
+//// [YieldStarExpression3_es6.ts]
+function *g() {
+    yield *;
+}
+
+//// [YieldStarExpression3_es6.js]
+function g() {
+    yield* ;
+}
diff --git a/tests/baselines/reference/YieldStarExpression4_es6.errors.txt b/tests/baselines/reference/YieldStarExpression4_es6.errors.txt
new file mode 100644
index 00000000000..45d96c9ea57
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression4_es6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts(1,10): error TS9001: Generators are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts(2,5): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts (2 errors) ====
+    function *g() {
+             ~
+!!! error TS9001: Generators are not currently supported.
+        yield * [];
+        ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldStarExpression4_es6.js b/tests/baselines/reference/YieldStarExpression4_es6.js
new file mode 100644
index 00000000000..6283b81cca3
--- /dev/null
+++ b/tests/baselines/reference/YieldStarExpression4_es6.js
@@ -0,0 +1,9 @@
+//// [YieldStarExpression4_es6.ts]
+function *g() {
+    yield * [];
+}
+
+//// [YieldStarExpression4_es6.js]
+function g() {
+    yield* [];
+}
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression1_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression1_es6.ts
new file mode 100644
index 00000000000..d0b2a172433
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression1_es6.ts
@@ -0,0 +1 @@
+yield * [];
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression2_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression2_es6.ts
new file mode 100644
index 00000000000..9a618df4bd0
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression2_es6.ts
@@ -0,0 +1 @@
+yield *;
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression3_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression3_es6.ts
new file mode 100644
index 00000000000..3384d609c16
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression3_es6.ts
@@ -0,0 +1,3 @@
+function *g() {
+    yield *;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts
new file mode 100644
index 00000000000..4e652232e6a
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldStarExpression4_es6.ts
@@ -0,0 +1,3 @@
+function *g() {
+    yield * [];
+}
\ No newline at end of file