diff --git a/tests/baselines/reference/ComputedPropertyName1.errors.txt b/tests/baselines/reference/ComputedPropertyName1.errors.txt
new file mode 100644
index 0000000000..89423599a4
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName1.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts(1,15): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts(1,12): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts (3 errors) ====
+    var v = { [e] };
+              ~
+!!! error TS1136: Property assignment expected.
+                  ~
+!!! error TS1128: Declaration or statement expected.
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName10.errors.txt b/tests/baselines/reference/ComputedPropertyName10.errors.txt
new file mode 100644
index 0000000000..c880e57859
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName10.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts(2,8): error TS1005: ';' expected.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts (1 errors) ====
+    class C {
+       [e] = 1
+           ~
+!!! error TS1005: ';' expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName11.errors.txt b/tests/baselines/reference/ComputedPropertyName11.errors.txt
new file mode 100644
index 0000000000..3b23c2f828
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName11.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts(2,7): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts(2,8): error TS1109: Expression expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts(3,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts (3 errors) ====
+    class C {
+       [e]();
+          ~
+!!! error TS1005: ';' expected.
+           ~
+!!! error TS1109: Expression expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName12.errors.txt b/tests/baselines/reference/ComputedPropertyName12.errors.txt
new file mode 100644
index 0000000000..575574c2d7
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName12.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts(2,7): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts(2,10): error TS1005: '=>' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts(3,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts (3 errors) ====
+    class C {
+       [e]() { }
+          ~
+!!! error TS1005: ';' expected.
+             ~
+!!! error TS1005: '=>' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName13.errors.txt b/tests/baselines/reference/ComputedPropertyName13.errors.txt
new file mode 100644
index 0000000000..2024b4d712
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName13.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts(1,11): error TS1022: An index signature parameter must have a type annotation.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts (1 errors) ====
+    var v: { [e]: number };
+              ~
+!!! error TS1022: An index signature parameter must have a type annotation.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName14.errors.txt b/tests/baselines/reference/ComputedPropertyName14.errors.txt
new file mode 100644
index 0000000000..4fe3cf4e12
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName14.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts(1,13): error TS1005: ';' expected.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts (1 errors) ====
+    var v: { [e](): number };
+                ~
+!!! error TS1005: ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName15.errors.txt b/tests/baselines/reference/ComputedPropertyName15.errors.txt
new file mode 100644
index 0000000000..4ab96e131e
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName15.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts(1,32): error TS1022: An index signature parameter must have a type annotation.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts (1 errors) ====
+    var v: { [e: number]: string; [e]: number };
+                                   ~
+!!! error TS1022: An index signature parameter must have a type annotation.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName16.errors.txt b/tests/baselines/reference/ComputedPropertyName16.errors.txt
new file mode 100644
index 0000000000..631449a818
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName16.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(2,3): error TS1132: Enum member expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(3,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(2,3): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(2,4): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts (4 errors) ====
+    enum E {
+      [e] = 1
+      ~
+!!! error TS1132: Enum member expected.
+      ~~~
+!!! error TS2364: Invalid left-hand side of assignment expression.
+       ~
+!!! error TS2304: Cannot find name 'e'.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName17.errors.txt b/tests/baselines/reference/ComputedPropertyName17.errors.txt
new file mode 100644
index 0000000000..3a3d5ca80f
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName17.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,15): error TS1003: Identifier expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,22): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,26): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,16): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts (4 errors) ====
+    var v = { set [e](v) { } }
+                  ~
+!!! error TS1003: Identifier expected.
+                         ~
+!!! error TS1005: ',' expected.
+                             ~
+!!! error TS1128: Declaration or statement expected.
+                   ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName18.errors.txt b/tests/baselines/reference/ComputedPropertyName18.errors.txt
new file mode 100644
index 0000000000..1df180bc9c
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName18.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts(1,13): error TS1005: ';' expected.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts (1 errors) ====
+    var v: { [e]?(): number };
+                ~
+!!! error TS1005: ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName19.errors.txt b/tests/baselines/reference/ComputedPropertyName19.errors.txt
new file mode 100644
index 0000000000..7e063befdc
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName19.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts(1,13): error TS1005: ';' expected.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts (1 errors) ====
+    var v: { [e]? };
+                ~
+!!! error TS1005: ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName2.errors.txt b/tests/baselines/reference/ComputedPropertyName2.errors.txt
new file mode 100644
index 0000000000..fd2bf09a09
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName2.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,14): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,16): error TS1134: Variable declaration expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,18): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,12): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts (5 errors) ====
+    var v = { [e]: 1 };
+              ~
+!!! error TS1136: Property assignment expected.
+                 ~
+!!! error TS1005: ',' expected.
+                   ~
+!!! error TS1134: Variable declaration expected.
+                     ~
+!!! error TS1128: Declaration or statement expected.
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName3.errors.txt b/tests/baselines/reference/ComputedPropertyName3.errors.txt
new file mode 100644
index 0000000000..4aaaa46ca6
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName3.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,17): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,21): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,12): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts (4 errors) ====
+    var v = { [e]() { } };
+              ~
+!!! error TS1136: Property assignment expected.
+                    ~
+!!! error TS1005: ',' expected.
+                        ~
+!!! error TS1128: Declaration or statement expected.
+               ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName4.errors.txt b/tests/baselines/reference/ComputedPropertyName4.errors.txt
new file mode 100644
index 0000000000..d03de72fb5
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName4.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,15): error TS1003: Identifier expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,21): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,25): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,16): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts (4 errors) ====
+    var v = { get [e]() { } };
+                  ~
+!!! error TS1003: Identifier expected.
+                        ~
+!!! error TS1005: ',' expected.
+                            ~
+!!! error TS1128: Declaration or statement expected.
+                   ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName5.errors.txt b/tests/baselines/reference/ComputedPropertyName5.errors.txt
new file mode 100644
index 0000000000..61906ddcce
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName5.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,18): error TS1005: ':' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,28): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,32): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,18): error TS2304: Cannot find name 'get'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,23): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts (5 errors) ====
+    var v = { public get [e]() { } };
+                     ~~~
+!!! error TS1005: ':' expected.
+                               ~
+!!! error TS1005: ',' expected.
+                                   ~
+!!! error TS1128: Declaration or statement expected.
+                     ~~~
+!!! error TS2304: Cannot find name 'get'.
+                          ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName6.errors.txt b/tests/baselines/reference/ComputedPropertyName6.errors.txt
new file mode 100644
index 0000000000..979ad0a664
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName6.errors.txt
@@ -0,0 +1,28 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,14): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,16): error TS1134: Variable declaration expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,26): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,30): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,12): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,20): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,24): error TS2304: Cannot find name 'e'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts (8 errors) ====
+    var v = { [e]: 1, [e + e]: 2 };
+              ~
+!!! error TS1136: Property assignment expected.
+                 ~
+!!! error TS1005: ',' expected.
+                   ~
+!!! error TS1134: Variable declaration expected.
+                             ~
+!!! error TS1005: ';' expected.
+                                 ~
+!!! error TS1128: Declaration or statement expected.
+               ~
+!!! error TS2304: Cannot find name 'e'.
+                       ~
+!!! error TS2304: Cannot find name 'e'.
+                           ~
+!!! error TS2304: Cannot find name 'e'.
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName7.errors.txt b/tests/baselines/reference/ComputedPropertyName7.errors.txt
new file mode 100644
index 0000000000..594928afa1
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName7.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts(2,5): error TS1022: An index signature parameter must have a type annotation.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts (1 errors) ====
+    class C {
+       [e]
+        ~
+!!! error TS1022: An index signature parameter must have a type annotation.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName8.errors.txt b/tests/baselines/reference/ComputedPropertyName8.errors.txt
new file mode 100644
index 0000000000..881d107a80
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName8.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts(2,12): error TS1022: An index signature parameter must have a type annotation.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts (1 errors) ====
+    class C {
+       public [e]
+               ~
+!!! error TS1022: An index signature parameter must have a type annotation.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/ComputedPropertyName9.errors.txt b/tests/baselines/reference/ComputedPropertyName9.errors.txt
new file mode 100644
index 0000000000..e11503bb2f
--- /dev/null
+++ b/tests/baselines/reference/ComputedPropertyName9.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts(2,5): error TS1022: An index signature parameter must have a type annotation.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts(2,9): error TS2304: Cannot find name 'Type'.
+
+
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts (2 errors) ====
+    class C {
+       [e]: Type
+        ~
+!!! error TS1022: An index signature parameter must have a type annotation.
+            ~~~~
+!!! error TS2304: Cannot find name 'Type'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration1.js b/tests/baselines/reference/FunctionDeclaration1.js
new file mode 100644
index 0000000000..bc5afa0fec
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration1.js
@@ -0,0 +1,7 @@
+//// [FunctionDeclaration1.ts]
+function * foo() {
+}
+
+//// [FunctionDeclaration1.js]
+function foo() {
+}
diff --git a/tests/baselines/reference/FunctionDeclaration1.types b/tests/baselines/reference/FunctionDeclaration1.types
new file mode 100644
index 0000000000..94f1f2d456
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration1.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1.ts ===
+function * foo() {
+>foo : () => void
+}
diff --git a/tests/baselines/reference/FunctionDeclaration10.js b/tests/baselines/reference/FunctionDeclaration10.js
new file mode 100644
index 0000000000..069433637e
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration10.js
@@ -0,0 +1,8 @@
+//// [FunctionDeclaration10.ts]
+function * foo(a = yield => yield) {
+}
+
+//// [FunctionDeclaration10.js]
+function foo(a) {
+    if (a === void 0) { a = function (yield) { return yield; }; }
+}
diff --git a/tests/baselines/reference/FunctionDeclaration10.types b/tests/baselines/reference/FunctionDeclaration10.types
new file mode 100644
index 0000000000..0e88aeecf0
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration10.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10.ts ===
+function * foo(a = yield => yield) {
+>foo : (a?: (yield: any) => any) => void
+>a : (yield: any) => any
+>yield => yield : (yield: any) => any
+>yield : any
+>yield : any
+}
diff --git a/tests/baselines/reference/FunctionDeclaration11.js b/tests/baselines/reference/FunctionDeclaration11.js
new file mode 100644
index 0000000000..a458755491
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration11.js
@@ -0,0 +1,7 @@
+//// [FunctionDeclaration11.ts]
+function * yield() {
+}
+
+//// [FunctionDeclaration11.js]
+function yield() {
+}
diff --git a/tests/baselines/reference/FunctionDeclaration11.types b/tests/baselines/reference/FunctionDeclaration11.types
new file mode 100644
index 0000000000..8ba840b020
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration11.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11.ts ===
+function * yield() {
+>yield : () => void
+}
diff --git a/tests/baselines/reference/FunctionDeclaration12.errors.txt b/tests/baselines/reference/FunctionDeclaration12.errors.txt
new file mode 100644
index 0000000000..5bea114c4b
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration12.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts(1,20): error TS1005: '(' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts(1,25): error TS1005: '=' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts(1,28): error TS1005: '=>' expected.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts (3 errors) ====
+    var v = function * yield() { }
+                       ~~~~~
+!!! error TS1005: '(' expected.
+                            ~
+!!! error TS1005: '=' expected.
+                               ~
+!!! error TS1005: '=>' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration13.errors.txt b/tests/baselines/reference/FunctionDeclaration13.errors.txt
new file mode 100644
index 0000000000..2a0fc461e0
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration13.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts(3,11): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts (1 errors) ====
+    function * foo() {
+       // Legal to use 'yield' in a type context.
+       var v: yield;
+              ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration13.js b/tests/baselines/reference/FunctionDeclaration13.js
new file mode 100644
index 0000000000..9846e19c14
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration13.js
@@ -0,0 +1,12 @@
+//// [FunctionDeclaration13.ts]
+function * foo() {
+   // Legal to use 'yield' in a type context.
+   var v: yield;
+}
+
+
+//// [FunctionDeclaration13.js]
+function foo() {
+    // Legal to use 'yield' in a type context.
+    var v;
+}
diff --git a/tests/baselines/reference/FunctionDeclaration2.js b/tests/baselines/reference/FunctionDeclaration2.js
new file mode 100644
index 0000000000..09f3d6dd4c
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration2.js
@@ -0,0 +1,7 @@
+//// [FunctionDeclaration2.ts]
+function f(yield) {
+}
+
+//// [FunctionDeclaration2.js]
+function f(yield) {
+}
diff --git a/tests/baselines/reference/FunctionDeclaration2.types b/tests/baselines/reference/FunctionDeclaration2.types
new file mode 100644
index 0000000000..89fcb53b20
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration2.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2.ts ===
+function f(yield) {
+>f : (yield: any) => void
+>yield : any
+}
diff --git a/tests/baselines/reference/FunctionDeclaration4.types b/tests/baselines/reference/FunctionDeclaration4.types
new file mode 100644
index 0000000000..f261867809
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration4.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration4.ts ===
+function yield() {
+>yield : () => void
+}
diff --git a/tests/baselines/reference/FunctionDeclaration5.errors.txt b/tests/baselines/reference/FunctionDeclaration5.errors.txt
new file mode 100644
index 0000000000..eebbae4d8c
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration5.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,14): error TS1138: Parameter declaration expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,19): error TS1005: ';' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,14): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts (4 errors) ====
+    function*foo(yield) {
+                 ~~~~~
+!!! error TS1138: Parameter declaration expected.
+                      ~
+!!! error TS1005: ';' expected.
+             ~~~
+!!! error TS2391: Function implementation is missing or not immediately following the declaration.
+                 ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration8.errors.txt b/tests/baselines/reference/FunctionDeclaration8.errors.txt
new file mode 100644
index 0000000000..a5deb7f655
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration8.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,18): error TS1005: ',' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,24): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,12): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts (4 errors) ====
+    var v = { [yield]: foo }
+              ~
+!!! error TS1136: Property assignment expected.
+                     ~
+!!! error TS1005: ',' expected.
+                           ~
+!!! error TS1128: Declaration or statement expected.
+               ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration9.errors.txt b/tests/baselines/reference/FunctionDeclaration9.errors.txt
new file mode 100644
index 0000000000..2d070e90eb
--- /dev/null
+++ b/tests/baselines/reference/FunctionDeclaration9.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts(2,13): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts(2,20): error TS1005: ',' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts(3,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts (3 errors) ====
+    function * foo() {
+      var v = { [yield]: foo }
+                ~
+!!! error TS1136: Property assignment expected.
+                       ~
+!!! error TS1005: ',' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionExpression1.js b/tests/baselines/reference/FunctionExpression1.js
new file mode 100644
index 0000000000..d74342ef36
--- /dev/null
+++ b/tests/baselines/reference/FunctionExpression1.js
@@ -0,0 +1,6 @@
+//// [FunctionExpression1.ts]
+var v = function * () { }
+
+//// [FunctionExpression1.js]
+var v = function () {
+};
diff --git a/tests/baselines/reference/FunctionExpression1.types b/tests/baselines/reference/FunctionExpression1.types
new file mode 100644
index 0000000000..6a501aedf2
--- /dev/null
+++ b/tests/baselines/reference/FunctionExpression1.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/functionExpressions/FunctionExpression1.ts ===
+var v = function * () { }
+>v : () => void
+>function * () { } : () => void
+
diff --git a/tests/baselines/reference/FunctionExpression2.js b/tests/baselines/reference/FunctionExpression2.js
new file mode 100644
index 0000000000..784aea781a
--- /dev/null
+++ b/tests/baselines/reference/FunctionExpression2.js
@@ -0,0 +1,6 @@
+//// [FunctionExpression2.ts]
+var v = function * foo() { }
+
+//// [FunctionExpression2.js]
+var v = function foo() {
+};
diff --git a/tests/baselines/reference/FunctionExpression2.types b/tests/baselines/reference/FunctionExpression2.types
new file mode 100644
index 0000000000..488c181f3e
--- /dev/null
+++ b/tests/baselines/reference/FunctionExpression2.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/functionExpressions/FunctionExpression2.ts ===
+var v = function * foo() { }
+>v : () => void
+>function * foo() { } : () => void
+>foo : () => void
+
diff --git a/tests/baselines/reference/FunctionPropertyAssignments1.js b/tests/baselines/reference/FunctionPropertyAssignments1.js
new file mode 100644
index 0000000000..8285f88a5e
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments1.js
@@ -0,0 +1,6 @@
+//// [FunctionPropertyAssignments1.ts]
+var v = { *foo() { } }
+
+//// [FunctionPropertyAssignments1.js]
+var v = { foo: function () {
+} };
diff --git a/tests/baselines/reference/FunctionPropertyAssignments1.types b/tests/baselines/reference/FunctionPropertyAssignments1.types
new file mode 100644
index 0000000000..5821956b66
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments1.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1.ts ===
+var v = { *foo() { } }
+>v : { foo: () => void; }
+>{ *foo() { } } : { foo: () => void; }
+>foo : () => void
+>*foo() { } : () => void
+
diff --git a/tests/baselines/reference/FunctionPropertyAssignments2.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments2.errors.txt
new file mode 100644
index 0000000000..1737a65e02
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments2.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts(1,12): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts (1 errors) ====
+    var v = { *() { } }
+               ~
+!!! error TS1003: Identifier expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments3.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments3.errors.txt
new file mode 100644
index 0000000000..a0e8a3b5e5
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments3.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts(1,12): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts (1 errors) ====
+    var v = { *{ } }
+               ~
+!!! error TS1003: Identifier expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments4.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments4.errors.txt
new file mode 100644
index 0000000000..19288b269a
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments4.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts(1,13): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts (1 errors) ====
+    var v = { * }
+                ~
+!!! error TS1003: Identifier expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments5.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments5.errors.txt
new file mode 100644
index 0000000000..5b4a4b5a59
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments5.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,12): error TS1003: Identifier expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,22): error TS1005: ',' expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,26): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,13): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts (4 errors) ====
+    var v = { *[foo()]() { } }
+               ~
+!!! error TS1003: Identifier expected.
+                         ~
+!!! error TS1005: ',' expected.
+                             ~
+!!! error TS1128: Declaration or statement expected.
+                ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments6.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments6.errors.txt
new file mode 100644
index 0000000000..bf0e237aad
--- /dev/null
+++ b/tests/baselines/reference/FunctionPropertyAssignments6.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts(1,12): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts (1 errors) ====
+    var v = { *<T>() { } }
+               ~
+!!! error TS1003: Identifier expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration1.js b/tests/baselines/reference/MemberFunctionDeclaration1.js
new file mode 100644
index 0000000000..b5630337c9
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration1.js
@@ -0,0 +1,13 @@
+//// [MemberFunctionDeclaration1.ts]
+class C {
+   *foo() { }
+}
+
+//// [MemberFunctionDeclaration1.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.foo = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/MemberFunctionDeclaration1.types b/tests/baselines/reference/MemberFunctionDeclaration1.types
new file mode 100644
index 0000000000..869592d072
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration1.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration1.ts ===
+class C {
+>C : C
+
+   *foo() { }
+>foo : () => void
+}
diff --git a/tests/baselines/reference/MemberFunctionDeclaration2.js b/tests/baselines/reference/MemberFunctionDeclaration2.js
new file mode 100644
index 0000000000..22589facd2
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration2.js
@@ -0,0 +1,13 @@
+//// [MemberFunctionDeclaration2.ts]
+class C {
+   public * foo() { }
+}
+
+//// [MemberFunctionDeclaration2.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.foo = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/MemberFunctionDeclaration2.types b/tests/baselines/reference/MemberFunctionDeclaration2.types
new file mode 100644
index 0000000000..ad076636a2
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration2.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration2.ts ===
+class C {
+>C : C
+
+   public * foo() { }
+>foo : () => void
+}
diff --git a/tests/baselines/reference/MemberFunctionDeclaration3.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration3.errors.txt
new file mode 100644
index 0000000000..a9091ef1de
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration3.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(2,5): error TS1003: Identifier expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(2,10): error TS1005: ';' expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(2,13): error TS1005: '=>' expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(3,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts (4 errors) ====
+    class C {
+       *[foo]() { }
+        ~
+!!! error TS1003: Identifier expected.
+             ~
+!!! error TS1005: ';' expected.
+                ~
+!!! error TS1005: '=>' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration4.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration4.errors.txt
new file mode 100644
index 0000000000..262942cccb
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration4.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts(2,5): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts (1 errors) ====
+    class C {
+       *() { }
+        ~
+!!! error TS1003: Identifier expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration5.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration5.errors.txt
new file mode 100644
index 0000000000..262b9011e2
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts(3,1): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts (1 errors) ====
+    class C {
+       *
+    }
+    ~
+!!! error TS1003: Identifier expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration6.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration6.errors.txt
new file mode 100644
index 0000000000..eabbfc9ae7
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts(3,1): error TS1005: '(' expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts(2,5): error TS2391: Function implementation is missing or not immediately following the declaration.
+
+
+==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts (2 errors) ====
+    class C {
+       *foo
+        ~~~
+!!! error TS2391: Function implementation is missing or not immediately following the declaration.
+    }
+    ~
+!!! error TS1005: '(' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration7.js b/tests/baselines/reference/MemberFunctionDeclaration7.js
new file mode 100644
index 0000000000..fbb3a10aab
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration7.js
@@ -0,0 +1,13 @@
+//// [MemberFunctionDeclaration7.ts]
+class C {
+   *foo<T>() { }
+}
+
+//// [MemberFunctionDeclaration7.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.foo = function () {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/MemberFunctionDeclaration7.types b/tests/baselines/reference/MemberFunctionDeclaration7.types
new file mode 100644
index 0000000000..8c72504978
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration7.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration7.ts ===
+class C {
+>C : C
+
+   *foo<T>() { }
+>foo : <T>() => void
+>T : T
+}
diff --git a/tests/baselines/reference/MemberFunctionDeclaration8.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration8.errors.txt
new file mode 100644
index 0000000000..32f67c71ea
--- /dev/null
+++ b/tests/baselines/reference/MemberFunctionDeclaration8.errors.txt
@@ -0,0 +1,34 @@
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,12): error TS1127: Invalid character.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,14): error TS1129: Statement expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,19): error TS1005: '(' expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(5,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(6,3): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(7,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,9): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,16): error TS2391: Function implementation is missing or not immediately following the declaration.
+
+
+==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts (8 errors) ====
+    class C {
+      foo() {
+        // Make sure we don't think of *bar as the start of a generator method.
+        if (a) # * bar;
+               
+!!! error TS1127: Invalid character.
+                 ~
+!!! error TS1129: Statement expected.
+                      ~
+!!! error TS1005: '(' expected.
+            ~
+!!! error TS2304: Cannot find name 'a'.
+                   ~~~
+!!! error TS2391: Function implementation is missing or not immediately following the declaration.
+        return bar; 
+        ~~~~~~
+!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+      }
+      ~
+!!! error TS1128: Declaration or statement expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/TemplateExpression1.errors.txt b/tests/baselines/reference/TemplateExpression1.errors.txt
new file mode 100644
index 0000000000..bf57f5ef24
--- /dev/null
+++ b/tests/baselines/reference/TemplateExpression1.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/templates/TemplateExpression1.ts(1,19): error TS1158: Invalid template literal; expected '}'
+tests/cases/conformance/es6/templates/TemplateExpression1.ts(1,17): error TS2304: Cannot find name 'a'.
+
+
+==== tests/cases/conformance/es6/templates/TemplateExpression1.ts (2 errors) ====
+    var v = `foo ${ a 
+                      
+!!! error TS1158: Invalid template literal; expected '}'
+                    ~
+!!! error TS2304: Cannot find name 'a'.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression1.errors.txt b/tests/baselines/reference/YieldExpression1.errors.txt
new file mode 100644
index 0000000000..ac9bdd04ab
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression1.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts(1,1): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts (1 errors) ====
+    yield;
+    ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression1.js b/tests/baselines/reference/YieldExpression1.js
new file mode 100644
index 0000000000..84f01f084a
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression1.js
@@ -0,0 +1,5 @@
+//// [YieldExpression1.ts]
+yield;
+
+//// [YieldExpression1.js]
+yield;
diff --git a/tests/baselines/reference/YieldExpression10.js b/tests/baselines/reference/YieldExpression10.js
new file mode 100644
index 0000000000..8d6a1bcfd7
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression10.js
@@ -0,0 +1,11 @@
+//// [YieldExpression10.ts]
+var v = { * foo() {
+    yield(foo);
+  }
+}
+
+
+//// [YieldExpression10.js]
+var v = { foo: function () {
+    ;
+} };
diff --git a/tests/baselines/reference/YieldExpression10.types b/tests/baselines/reference/YieldExpression10.types
new file mode 100644
index 0000000000..1cc2cebafc
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression10.types
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression10.ts ===
+var v = { * foo() {
+>v : { foo: () => void; }
+>{ * foo() {    yield(foo);  }} : { foo: () => void; }
+>foo : () => void
+>* foo() {    yield(foo);  } : () => void
+
+    yield(foo);
+  }
+}
+
diff --git a/tests/baselines/reference/YieldExpression11.js b/tests/baselines/reference/YieldExpression11.js
new file mode 100644
index 0000000000..e69d9b6c06
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression11.js
@@ -0,0 +1,16 @@
+//// [YieldExpression11.ts]
+class C {
+  *foo() {
+    yield(foo);
+  }
+}
+
+//// [YieldExpression11.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.foo = function () {
+        ;
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/YieldExpression11.types b/tests/baselines/reference/YieldExpression11.types
new file mode 100644
index 0000000000..da261ed041
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression11.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression11.ts ===
+class C {
+>C : C
+
+  *foo() {
+>foo : () => void
+
+    yield(foo);
+  }
+}
diff --git a/tests/baselines/reference/YieldExpression12.errors.txt b/tests/baselines/reference/YieldExpression12.errors.txt
new file mode 100644
index 0000000000..47f3edc220
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression12.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts(3,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts (1 errors) ====
+    class C {
+      constructor() {
+         yield foo
+         ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression13.js b/tests/baselines/reference/YieldExpression13.js
new file mode 100644
index 0000000000..f3f36cfecd
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression13.js
@@ -0,0 +1,7 @@
+//// [YieldExpression13.ts]
+function* foo() { yield }
+
+//// [YieldExpression13.js]
+function foo() {
+    ;
+}
diff --git a/tests/baselines/reference/YieldExpression13.types b/tests/baselines/reference/YieldExpression13.types
new file mode 100644
index 0000000000..0d1cb06ba5
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression13.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression13.ts ===
+function* foo() { yield }
+>foo : () => void
+
diff --git a/tests/baselines/reference/YieldExpression14.errors.txt b/tests/baselines/reference/YieldExpression14.errors.txt
new file mode 100644
index 0000000000..89d0cf477c
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression14.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts(3,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts (1 errors) ====
+    class C {
+      foo() {
+         yield foo
+         ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression15.errors.txt b/tests/baselines/reference/YieldExpression15.errors.txt
new file mode 100644
index 0000000000..3f90fce599
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression15.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts(2,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts (1 errors) ====
+    var v = () => {
+         yield foo
+         ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.
+      }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression16.errors.txt b/tests/baselines/reference/YieldExpression16.errors.txt
new file mode 100644
index 0000000000..8fb1775222
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression16.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts(3,5): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts (1 errors) ====
+    function* foo() {
+      function bar() {
+        yield foo;
+        ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression17.errors.txt b/tests/baselines/reference/YieldExpression17.errors.txt
new file mode 100644
index 0000000000..9477ff2f13
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression17.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts(1,15): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts (2 errors) ====
+    var v = { get foo() { yield foo; } }
+                  ~~~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+                  ~~~
+!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression18.errors.txt b/tests/baselines/reference/YieldExpression18.errors.txt
new file mode 100644
index 0000000000..2707e5780b
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression18.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts(2,1): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts (1 errors) ====
+    "use strict";
+    yield(foo);
+    ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression19.js b/tests/baselines/reference/YieldExpression19.js
new file mode 100644
index 0000000000..39b9cda44f
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression19.js
@@ -0,0 +1,17 @@
+//// [YieldExpression19.ts]
+function*foo() {
+  function bar() {
+    function* quux() {
+      yield(foo);
+    }
+  }
+}
+
+//// [YieldExpression19.js]
+function foo() {
+    function bar() {
+        function quux() {
+            ;
+        }
+    }
+}
diff --git a/tests/baselines/reference/YieldExpression19.types b/tests/baselines/reference/YieldExpression19.types
new file mode 100644
index 0000000000..315c1a541c
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression19.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression19.ts ===
+function*foo() {
+>foo : () => void
+
+  function bar() {
+>bar : () => void
+
+    function* quux() {
+>quux : () => void
+
+      yield(foo);
+    }
+  }
+}
diff --git a/tests/baselines/reference/YieldExpression2.errors.txt b/tests/baselines/reference/YieldExpression2.errors.txt
new file mode 100644
index 0000000000..4b4e549d7b
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression2.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts(1,1): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts (1 errors) ====
+    yield foo;
+    ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression3.js b/tests/baselines/reference/YieldExpression3.js
new file mode 100644
index 0000000000..39a1c419e9
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression3.js
@@ -0,0 +1,11 @@
+//// [YieldExpression3.ts]
+function* foo() {
+  yield
+  yield
+}
+
+//// [YieldExpression3.js]
+function foo() {
+    ;
+    ;
+}
diff --git a/tests/baselines/reference/YieldExpression3.types b/tests/baselines/reference/YieldExpression3.types
new file mode 100644
index 0000000000..702584b44f
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression3.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression3.ts ===
+function* foo() {
+>foo : () => void
+
+  yield
+  yield
+}
diff --git a/tests/baselines/reference/YieldExpression4.js b/tests/baselines/reference/YieldExpression4.js
new file mode 100644
index 0000000000..e85a41e858
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression4.js
@@ -0,0 +1,11 @@
+//// [YieldExpression4.ts]
+function* foo() {
+  yield;
+  yield;
+}
+
+//// [YieldExpression4.js]
+function foo() {
+    ;
+    ;
+}
diff --git a/tests/baselines/reference/YieldExpression4.types b/tests/baselines/reference/YieldExpression4.types
new file mode 100644
index 0000000000..cd57f45ba7
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression4.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression4.ts ===
+function* foo() {
+>foo : () => void
+
+  yield;
+  yield;
+}
diff --git a/tests/baselines/reference/YieldExpression5.errors.txt b/tests/baselines/reference/YieldExpression5.errors.txt
new file mode 100644
index 0000000000..8036304387
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression5.ts(3,1): error TS1109: Expression expected.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression5.ts (1 errors) ====
+    function* foo() {
+      yield*
+    }
+    ~
+!!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression6.js b/tests/baselines/reference/YieldExpression6.js
new file mode 100644
index 0000000000..27fda405cd
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression6.js
@@ -0,0 +1,9 @@
+//// [YieldExpression6.ts]
+function* foo() {
+  yield*foo
+}
+
+//// [YieldExpression6.js]
+function foo() {
+    ;
+}
diff --git a/tests/baselines/reference/YieldExpression6.types b/tests/baselines/reference/YieldExpression6.types
new file mode 100644
index 0000000000..6df16df527
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression6.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression6.ts ===
+function* foo() {
+>foo : () => void
+
+  yield*foo
+}
diff --git a/tests/baselines/reference/YieldExpression7.js b/tests/baselines/reference/YieldExpression7.js
new file mode 100644
index 0000000000..152fe36db5
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression7.js
@@ -0,0 +1,9 @@
+//// [YieldExpression7.ts]
+function* foo() {
+  yield foo
+}
+
+//// [YieldExpression7.js]
+function foo() {
+    ;
+}
diff --git a/tests/baselines/reference/YieldExpression7.types b/tests/baselines/reference/YieldExpression7.types
new file mode 100644
index 0000000000..40d4506c86
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression7.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression7.ts ===
+function* foo() {
+>foo : () => void
+
+  yield foo
+}
diff --git a/tests/baselines/reference/YieldExpression8.errors.txt b/tests/baselines/reference/YieldExpression8.errors.txt
new file mode 100644
index 0000000000..ee0e578931
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression8.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression8.ts(1,1): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression8.ts (1 errors) ====
+    yield(foo);
+    ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+    function* foo() {
+      yield(foo);
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression8.js b/tests/baselines/reference/YieldExpression8.js
new file mode 100644
index 0000000000..07b80cf3e5
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression8.js
@@ -0,0 +1,11 @@
+//// [YieldExpression8.ts]
+yield(foo);
+function* foo() {
+  yield(foo);
+}
+
+//// [YieldExpression8.js]
+yield(foo);
+function foo() {
+    ;
+}
diff --git a/tests/baselines/reference/YieldExpression9.js b/tests/baselines/reference/YieldExpression9.js
new file mode 100644
index 0000000000..72365abcd7
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression9.js
@@ -0,0 +1,9 @@
+//// [YieldExpression9.ts]
+var v = function*() {
+  yield(foo);
+}
+
+//// [YieldExpression9.js]
+var v = function () {
+    ;
+};
diff --git a/tests/baselines/reference/YieldExpression9.types b/tests/baselines/reference/YieldExpression9.types
new file mode 100644
index 0000000000..4c5242369c
--- /dev/null
+++ b/tests/baselines/reference/YieldExpression9.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression9.ts ===
+var v = function*() {
+>v : () => void
+>function*() {  yield(foo);} : () => void
+
+  yield(foo);
+}
diff --git a/tests/baselines/reference/templateStringInYieldKeyword.errors.txt b/tests/baselines/reference/templateStringInYieldKeyword.errors.txt
deleted file mode 100644
index 50b780ad3c..0000000000
--- a/tests/baselines/reference/templateStringInYieldKeyword.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts(1,9): error TS1003: Identifier expected.
-tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts(1,15): error TS1005: ';' expected.
-tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts(1,11): error TS2304: Cannot find name 'gen'.
-tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts(3,13): error TS2304: Cannot find name 'yield'.
-
-
-==== tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts (4 errors) ====
-    function* gen {
-            ~
-!!! error TS1003: Identifier expected.
-                  ~
-!!! error TS1005: ';' expected.
-              ~~~
-!!! error TS2304: Cannot find name 'gen'.
-        // Once this is supported, the inner expression does not need to be parenthesized.
-        var x = yield `abc${ x }def`;
-                ~~~~~
-!!! error TS2304: Cannot find name 'yield'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringInYieldKeyword.js b/tests/baselines/reference/templateStringInYieldKeyword.js
new file mode 100644
index 0000000000..8e98b269cd
--- /dev/null
+++ b/tests/baselines/reference/templateStringInYieldKeyword.js
@@ -0,0 +1,12 @@
+//// [templateStringInYieldKeyword.ts]
+function* gen() {
+    // Once this is supported, the inner expression does not need to be parenthesized.
+    var x = yield `abc${ x }def`;
+}
+
+
+//// [templateStringInYieldKeyword.js]
+function gen() {
+    // Once this is supported, the inner expression does not need to be parenthesized.
+    var x = ;
+}
diff --git a/tests/baselines/reference/templateStringInYieldKeyword.types b/tests/baselines/reference/templateStringInYieldKeyword.types
new file mode 100644
index 0000000000..c3d49ddffb
--- /dev/null
+++ b/tests/baselines/reference/templateStringInYieldKeyword.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts ===
+function* gen() {
+>gen : () => void
+
+    // Once this is supported, the inner expression does not need to be parenthesized.
+    var x = yield `abc${ x }def`;
+>x : unknown
+}
+
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.errors.txt b/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.errors.txt
index 3bf910f369..28f3394373 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.errors.txt
+++ b/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.errors.txt
@@ -1,29 +1,11 @@
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(1,9): error TS1003: Identifier expected.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(1,15): error TS1005: ';' expected.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(3,26): error TS1158: Invalid template literal; expected '}'
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(5,1): error TS1160: Unterminated template literal.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(1,11): error TS2304: Cannot find name 'gen'.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(3,20): error TS2304: Cannot find name 'yield'.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(3,30): error TS2304: Cannot find name 'def'.
+tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts(1,15): error TS1005: '(' expected.
 
 
-==== tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts (7 errors) ====
+==== tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeyword.ts (1 errors) ====
     function* gen {
-            ~
-!!! error TS1003: Identifier expected.
                   ~
-!!! error TS1005: ';' expected.
-              ~~~
-!!! error TS2304: Cannot find name 'gen'.
+!!! error TS1005: '(' expected.
         // Once this is supported, yield *must* be parenthesized.
         var x = `abc${ yield 10 }def`;
-                             ~~
-!!! error TS1158: Invalid template literal; expected '}'
-                       ~~~~~
-!!! error TS2304: Cannot find name 'yield'.
-                                 ~~~
-!!! error TS2304: Cannot find name 'def'.
     }
-    
-    
-!!! error TS1160: Unterminated template literal.
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt
deleted file mode 100644
index 4e62197e03..0000000000
--- a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(1,9): error TS1003: Identifier expected.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(1,17): error TS1005: ';' expected.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(3,26): error TS1158: Invalid template literal; expected '}'
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(5,1): error TS1160: Unterminated template literal.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(1,11): error TS2304: Cannot find name 'gen'.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(3,20): error TS2304: Cannot find name 'yield'.
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(3,30): error TS2304: Cannot find name 'def'.
-
-
-==== tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts (7 errors) ====
-    function* gen() {
-            ~
-!!! error TS1003: Identifier expected.
-                    ~
-!!! error TS1005: ';' expected.
-              ~~~
-!!! error TS2304: Cannot find name 'gen'.
-        // Once this is supported, yield *must* be parenthesized.
-        var x = `abc${ yield 10 }def`;
-                             ~~
-!!! error TS1158: Invalid template literal; expected '}'
-                       ~~~~~
-!!! error TS2304: Cannot find name 'yield'.
-                                 ~~~
-!!! error TS2304: Cannot find name 'def'.
-    }
-    
-    
-!!! error TS1160: Unterminated template literal.
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.js b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.js
new file mode 100644
index 0000000000..80021ecae2
--- /dev/null
+++ b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.js
@@ -0,0 +1,12 @@
+//// [templateStringWithEmbeddedYieldKeywordES6.ts]
+function* gen() {
+    // Once this is supported, yield *must* be parenthesized.
+    var x = `abc${ yield 10 }def`;
+}
+
+
+//// [templateStringWithEmbeddedYieldKeywordES6.js]
+function gen() {
+    // Once this is supported, yield *must* be parenthesized.
+    var x = `abc${}def`;
+}
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types
new file mode 100644
index 0000000000..c55b40148b
--- /dev/null
+++ b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts ===
+function* gen() {
+>gen : () => void
+
+    // Once this is supported, yield *must* be parenthesized.
+    var x = `abc${ yield 10 }def`;
+>x : string
+}
+