diff --git a/tests/baselines/reference/generatorES6_1.types b/tests/baselines/reference/generatorES6_1.types
index faf16398303..13ac7c05844 100644
--- a/tests/baselines/reference/generatorES6_1.types
+++ b/tests/baselines/reference/generatorES6_1.types
@@ -1,6 +1,7 @@
 === tests/cases/compiler/generatorES6_1.ts ===
 function* foo() {
->foo : () => void
+>foo : () => IterableIterator<any>
 
     yield
+>yield : any
 }
diff --git a/tests/baselines/reference/generatorES6_2.types b/tests/baselines/reference/generatorES6_2.types
index 2948424b120..9c9c8692757 100644
--- a/tests/baselines/reference/generatorES6_2.types
+++ b/tests/baselines/reference/generatorES6_2.types
@@ -3,8 +3,10 @@ class C {
 >C : C
 
     public * foo() {
->foo : () => void
+>foo : () => IterableIterator<number>
 
         yield 1
+>yield 1 : any
+>1 : number
     }
 }
diff --git a/tests/baselines/reference/generatorES6_3.types b/tests/baselines/reference/generatorES6_3.types
index e627fff9efd..e87ad23ba77 100644
--- a/tests/baselines/reference/generatorES6_3.types
+++ b/tests/baselines/reference/generatorES6_3.types
@@ -1,7 +1,9 @@
 === tests/cases/compiler/generatorES6_3.ts ===
 var v = function*() {
->v : () => void
->function*() {    yield 0} : () => void
+>v : () => IterableIterator<number>
+>function*() {    yield 0} : () => IterableIterator<number>
 
     yield 0
+>yield 0 : any
+>0 : number
 }
diff --git a/tests/baselines/reference/generatorES6_4.types b/tests/baselines/reference/generatorES6_4.types
index 5b34aff9f6e..64b0924919b 100644
--- a/tests/baselines/reference/generatorES6_4.types
+++ b/tests/baselines/reference/generatorES6_4.types
@@ -1,11 +1,13 @@
 === tests/cases/compiler/generatorES6_4.ts ===
 var v = { 
->v : { foo(): void; }
->{    *foo() {       yield 0   }} : { foo(): void; }
+>v : { foo(): IterableIterator<number>; }
+>{    *foo() {       yield 0   }} : { foo(): IterableIterator<number>; }
 
    *foo() {
->foo : () => void
+>foo : () => IterableIterator<number>
 
        yield 0
+>yield 0 : any
+>0 : number
    }
 }
diff --git a/tests/baselines/reference/generatorES6_5.types b/tests/baselines/reference/generatorES6_5.types
index 9e500c7f4b6..12396f69e24 100644
--- a/tests/baselines/reference/generatorES6_5.types
+++ b/tests/baselines/reference/generatorES6_5.types
@@ -1,8 +1,9 @@
 === tests/cases/compiler/generatorES6_5.ts ===
 function* foo() {
->foo : () => void
+>foo : () => IterableIterator<any>
 
     yield a ? b : c;
+>yield a ? b : c : any
 >a ? b : c : any
 >a : any
 >b : any
diff --git a/tests/baselines/reference/generatorES6_6.types b/tests/baselines/reference/generatorES6_6.types
index 731c9b47f55..4e3de8cea1e 100644
--- a/tests/baselines/reference/generatorES6_6.types
+++ b/tests/baselines/reference/generatorES6_6.types
@@ -9,5 +9,7 @@ class C {
 
     let a = yield 1;
 >a : any
+>yield 1 : any
+>1 : number
   }
 }
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types
index 9772a732868..3a6f5d16726 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types
+++ b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.types
@@ -1,10 +1,12 @@
 === tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts ===
 function* gen() {
->gen : () => void
+>gen : () => IterableIterator<number>
 
     // Once this is supported, yield *must* be parenthesized.
     var x = `abc${ yield 10 }def`;
 >x : string
 >`abc${ yield 10 }def` : string
+>yield 10 : any
+>10 : number
 }