diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts
new file mode 100644
index 00000000000..0703648cf0b
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts
@@ -0,0 +1 @@
+var v = { [e] };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts
new file mode 100644
index 00000000000..64f8b999003
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts
@@ -0,0 +1,3 @@
+class C {
+   [e] = 1
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts
new file mode 100644
index 00000000000..cfb1c736b40
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts
@@ -0,0 +1,3 @@
+class C {
+   [e]();
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts
new file mode 100644
index 00000000000..7e030263fcc
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts
@@ -0,0 +1,3 @@
+class C {
+   [e]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts
new file mode 100644
index 00000000000..2783955e804
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts
@@ -0,0 +1 @@
+var v: { [e]: number };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts
new file mode 100644
index 00000000000..534b418854b
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts
@@ -0,0 +1 @@
+var v: { [e](): number };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts
new file mode 100644
index 00000000000..7b9965e8177
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts
@@ -0,0 +1 @@
+var v: { [e: number]: string; [e]: number };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts
new file mode 100644
index 00000000000..a088319bf94
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts
@@ -0,0 +1,3 @@
+enum E {
+  [e] = 1
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts
new file mode 100644
index 00000000000..2d002e9ca43
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts
@@ -0,0 +1 @@
+var v = { set [e](v) { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts
new file mode 100644
index 00000000000..0659070d643
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts
@@ -0,0 +1 @@
+var v: { [e]?(): number };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts
new file mode 100644
index 00000000000..b6c1756d097
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts
@@ -0,0 +1 @@
+var v: { [e]? };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts
new file mode 100644
index 00000000000..34c9d6d918a
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts
@@ -0,0 +1 @@
+var v = { [e]: 1 };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts
new file mode 100644
index 00000000000..08ad781e2ba
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts
@@ -0,0 +1 @@
+var v = { [e]() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts
new file mode 100644
index 00000000000..d5a331ebb4c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts
@@ -0,0 +1 @@
+var v = { get [e]() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts
new file mode 100644
index 00000000000..a254f65ee67
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts
@@ -0,0 +1 @@
+var v = { public get [e]() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts
new file mode 100644
index 00000000000..c09627a0d46
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts
@@ -0,0 +1 @@
+var v = { [e]: 1, [e + e]: 2 };
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts
new file mode 100644
index 00000000000..b23944da796
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts
@@ -0,0 +1,3 @@
+class C {
+   [e]
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts
new file mode 100644
index 00000000000..18f1fd61276
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts
@@ -0,0 +1,3 @@
+class C {
+   public [e]
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts
new file mode 100644
index 00000000000..18e290722aa
--- /dev/null
+++ b/tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts
@@ -0,0 +1,3 @@
+class C {
+   [e]: Type
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration1.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration1.ts
new file mode 100644
index 00000000000..3bb832ccf49
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration1.ts
@@ -0,0 +1,3 @@
+class C {
+   *foo() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration2.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration2.ts
new file mode 100644
index 00000000000..2174110723d
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration2.ts
@@ -0,0 +1,3 @@
+class C {
+   public * foo() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts
new file mode 100644
index 00000000000..8db736f99bb
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts
@@ -0,0 +1,3 @@
+class C {
+   *[foo]() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts
new file mode 100644
index 00000000000..0fa98ce98c4
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts
@@ -0,0 +1,3 @@
+class C {
+   *() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts
new file mode 100644
index 00000000000..474316195f0
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts
@@ -0,0 +1,3 @@
+class C {
+   *
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts
new file mode 100644
index 00000000000..1efad0a7842
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts
@@ -0,0 +1,3 @@
+class C {
+   *foo
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration7.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration7.ts
new file mode 100644
index 00000000000..93f05494107
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration7.ts
@@ -0,0 +1,3 @@
+class C {
+   *foo<T>() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts
new file mode 100644
index 00000000000..069d7339869
--- /dev/null
+++ b/tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts
@@ -0,0 +1,7 @@
+class C {
+  foo() {
+    // Make sure we don't think of *bar as the start of a generator method.
+    if (a) # * bar;
+    return bar; 
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1.ts
new file mode 100644
index 00000000000..650e619fc00
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1.ts
@@ -0,0 +1,2 @@
+function * foo() {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10.ts
new file mode 100644
index 00000000000..fa7a20f78ba
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10.ts
@@ -0,0 +1,2 @@
+function * foo(a = yield => yield) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11.ts
new file mode 100644
index 00000000000..07b452678eb
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11.ts
@@ -0,0 +1,2 @@
+function * yield() {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts
new file mode 100644
index 00000000000..ff08bd514af
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts
@@ -0,0 +1 @@
+var v = function * yield() { }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts
new file mode 100644
index 00000000000..e5e30dc4b0e
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts
@@ -0,0 +1,4 @@
+function * foo() {
+   // Legal to use 'yield' in a type context.
+   var v: yield;
+}
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2.ts
new file mode 100644
index 00000000000..136dd1f9b43
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2.ts
@@ -0,0 +1,2 @@
+function f(yield) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration3.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration3.ts
new file mode 100644
index 00000000000..33324d88158
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration3.ts
@@ -0,0 +1,2 @@
+function f(yield = yield) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration4.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration4.ts
new file mode 100644
index 00000000000..fd9170a726a
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration4.ts
@@ -0,0 +1,2 @@
+function yield() {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts
new file mode 100644
index 00000000000..3e97edf26a6
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts
@@ -0,0 +1,2 @@
+function*foo(yield) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6.ts
new file mode 100644
index 00000000000..144aae6b63c
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6.ts
@@ -0,0 +1,2 @@
+function*foo(a = yield) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7.ts
new file mode 100644
index 00000000000..3cc50e85592
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7.ts
@@ -0,0 +1,5 @@
+function*bar() {
+  // 'yield' here is an identifier, and not a yield expression.
+  function*foo(a = yield) {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts
new file mode 100644
index 00000000000..4b65f204bab
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts
@@ -0,0 +1 @@
+var v = { [yield]: foo }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts
new file mode 100644
index 00000000000..d30d6535d4b
--- /dev/null
+++ b/tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts
@@ -0,0 +1,3 @@
+function * foo() {
+  var v = { [yield]: foo }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionExpressions/FunctionExpression1.ts b/tests/cases/conformance/es6/functionExpressions/FunctionExpression1.ts
new file mode 100644
index 00000000000..42ff543edf7
--- /dev/null
+++ b/tests/cases/conformance/es6/functionExpressions/FunctionExpression1.ts
@@ -0,0 +1 @@
+var v = function * () { }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionExpressions/FunctionExpression2.ts b/tests/cases/conformance/es6/functionExpressions/FunctionExpression2.ts
new file mode 100644
index 00000000000..2669a3e386f
--- /dev/null
+++ b/tests/cases/conformance/es6/functionExpressions/FunctionExpression2.ts
@@ -0,0 +1 @@
+var v = function * foo() { }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1.ts b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1.ts
new file mode 100644
index 00000000000..1d6cb9f92fb
--- /dev/null
+++ b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1.ts
@@ -0,0 +1 @@
+var v = { *foo() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts
new file mode 100644
index 00000000000..e58c7077a49
--- /dev/null
+++ b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts
@@ -0,0 +1 @@
+var v = { *() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts
new file mode 100644
index 00000000000..ebcd542a2a0
--- /dev/null
+++ b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts
@@ -0,0 +1 @@
+var v = { *{ } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts
new file mode 100644
index 00000000000..3b23ea4fc97
--- /dev/null
+++ b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts
@@ -0,0 +1 @@
+var v = { * }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts
new file mode 100644
index 00000000000..b1628dd2f2c
--- /dev/null
+++ b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts
@@ -0,0 +1 @@
+var v = { *[foo()]() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts
new file mode 100644
index 00000000000..6bfae9ec77c
--- /dev/null
+++ b/tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts
@@ -0,0 +1 @@
+var v = { *<T>() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/templates/TemplateExpression1.ts b/tests/cases/conformance/es6/templates/TemplateExpression1.ts
new file mode 100644
index 00000000000..e6980c4c8e2
--- /dev/null
+++ b/tests/cases/conformance/es6/templates/TemplateExpression1.ts
@@ -0,0 +1 @@
+var v = `foo ${ a 
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts b/tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts
index 4a80e452251..d020d7c7607 100644
--- a/tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts
+++ b/tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts
@@ -1,4 +1,4 @@
-function* gen {
+function* gen() {
     // Once this is supported, the inner expression does not need to be parenthesized.
     var x = yield `abc${ x }def`;
 }
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts
new file mode 100644
index 00000000000..bdbfe1e27a7
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts
@@ -0,0 +1 @@
+yield;
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression10.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression10.ts
new file mode 100644
index 00000000000..b95174babdf
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression10.ts
@@ -0,0 +1,4 @@
+var v = { * foo() {
+    yield(foo);
+  }
+}
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression11.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression11.ts
new file mode 100644
index 00000000000..7577e5ce46b
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression11.ts
@@ -0,0 +1,5 @@
+class C {
+  *foo() {
+    yield(foo);
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts
new file mode 100644
index 00000000000..3ee6a464049
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts
@@ -0,0 +1,5 @@
+class C {
+  constructor() {
+     yield foo
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression13.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression13.ts
new file mode 100644
index 00000000000..2ac6f631465
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression13.ts
@@ -0,0 +1 @@
+function* foo() { yield }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts
new file mode 100644
index 00000000000..d545175c94a
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts
@@ -0,0 +1,5 @@
+class C {
+  foo() {
+     yield foo
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts
new file mode 100644
index 00000000000..b2793208aaa
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts
@@ -0,0 +1,3 @@
+var v = () => {
+     yield foo
+  }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts
new file mode 100644
index 00000000000..1933df26ecf
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts
@@ -0,0 +1,5 @@
+function* foo() {
+  function bar() {
+    yield foo;
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts
new file mode 100644
index 00000000000..7ef3a1fe350
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts
@@ -0,0 +1 @@
+var v = { get foo() { yield foo; } }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts
new file mode 100644
index 00000000000..f91016aabf0
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts
@@ -0,0 +1,2 @@
+"use strict";
+yield(foo);
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression19.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression19.ts
new file mode 100644
index 00000000000..0183d72ea61
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression19.ts
@@ -0,0 +1,7 @@
+function*foo() {
+  function bar() {
+    function* quux() {
+      yield(foo);
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts
new file mode 100644
index 00000000000..39bbe4e7eb0
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts
@@ -0,0 +1 @@
+yield foo;
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression3.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression3.ts
new file mode 100644
index 00000000000..04ae4b8d223
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression3.ts
@@ -0,0 +1,4 @@
+function* foo() {
+  yield
+  yield
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression4.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression4.ts
new file mode 100644
index 00000000000..cd2f9708048
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression4.ts
@@ -0,0 +1,4 @@
+function* foo() {
+  yield;
+  yield;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression5.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression5.ts
new file mode 100644
index 00000000000..af4b3a84d2f
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression5.ts
@@ -0,0 +1,3 @@
+function* foo() {
+  yield*
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression6.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression6.ts
new file mode 100644
index 00000000000..87d307dcda0
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression6.ts
@@ -0,0 +1,3 @@
+function* foo() {
+  yield*foo
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression7.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression7.ts
new file mode 100644
index 00000000000..0db38fd498b
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression7.ts
@@ -0,0 +1,3 @@
+function* foo() {
+  yield foo
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression8.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression8.ts
new file mode 100644
index 00000000000..b6b08301239
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression8.ts
@@ -0,0 +1,4 @@
+yield(foo);
+function* foo() {
+  yield(foo);
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/yieldExpressions/YieldExpression9.ts b/tests/cases/conformance/es6/yieldExpressions/YieldExpression9.ts
new file mode 100644
index 00000000000..9119deae832
--- /dev/null
+++ b/tests/cases/conformance/es6/yieldExpressions/YieldExpression9.ts
@@ -0,0 +1,3 @@
+var v = function*() {
+  yield(foo);
+}
\ No newline at end of file