diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d666da91fe0..a92e77f6978 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11246,8 +11246,6 @@ module ts {
         }
 
         function checkGrammarForOfStatement(forOfStatement: ForOfStatement): boolean {
-            // Temporarily disallow for-of statements until type check work is complete.
-            return grammarErrorOnFirstToken(forOfStatement, Diagnostics.for_of_statements_are_not_currently_supported);
             if (languageVersion < ScriptTarget.ES6) {
                 return grammarErrorOnFirstToken(forOfStatement, Diagnostics.for_of_statements_are_only_available_when_targeting_ECMAScript_6_or_higher);
             }
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 7c53d70f591..5f8be858627 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -471,6 +471,5 @@ module ts {
         yield_expressions_are_not_currently_supported: { code: 9000, category: DiagnosticCategory.Error, key: "'yield' expressions are not currently supported." },
         Generators_are_not_currently_supported: { code: 9001, category: DiagnosticCategory.Error, key: "Generators are not currently supported." },
         The_arguments_object_cannot_be_referenced_in_an_arrow_function_Consider_using_a_standard_function_expression: { code: 9002, category: DiagnosticCategory.Error, key: "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression." },
-        for_of_statements_are_not_currently_supported: { code: 9003, category: DiagnosticCategory.Error, key: "'for...of' statements are not currently supported." },
     };
 }
\ No newline at end of file
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 7a7efe4e43c..b7102337ef6 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1877,9 +1877,5 @@
     "The 'arguments' object cannot be referenced in an arrow function. Consider using a standard function expression.": {
         "category": "Error",
         "code": 9002
-    },
-    "'for...of' statements are not currently supported.": {
-        "category": "Error",
-        "code": 9003
     }
 }
diff --git a/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt b/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt
index 9c1a39b1f4a..c280b597b2c 100644
--- a/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement1.d.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement1.d.ts (1 errors) ====
     for (var i of e) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement10.errors.txt b/tests/baselines/reference/parserES5ForOfStatement10.errors.txt
index d7f411b1879..5cee7472d24 100644
--- a/tests/baselines/reference/parserES5ForOfStatement10.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement10.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement10.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement10.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement10.ts (1 errors) ====
     for (const v of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement11.errors.txt b/tests/baselines/reference/parserES5ForOfStatement11.errors.txt
index 48805a336c7..79b16ed1ad6 100644
--- a/tests/baselines/reference/parserES5ForOfStatement11.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement11.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement11.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement11.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement11.ts (1 errors) ====
     for (const [a, b] of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement12.errors.txt b/tests/baselines/reference/parserES5ForOfStatement12.errors.txt
index 3b9f242b975..cdb6db690cf 100644
--- a/tests/baselines/reference/parserES5ForOfStatement12.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement12.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement12.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement12.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement12.ts (1 errors) ====
     for (const {a, b} of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement13.errors.txt b/tests/baselines/reference/parserES5ForOfStatement13.errors.txt
index 8b8c8ce0868..9d97fd9e249 100644
--- a/tests/baselines/reference/parserES5ForOfStatement13.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement13.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement13.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement13.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement13.ts (1 errors) ====
     for (let {a, b} of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement14.errors.txt b/tests/baselines/reference/parserES5ForOfStatement14.errors.txt
index dc4db95270a..303439ec447 100644
--- a/tests/baselines/reference/parserES5ForOfStatement14.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement14.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement14.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement14.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement14.ts (1 errors) ====
     for (let [a, b] of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement15.errors.txt b/tests/baselines/reference/parserES5ForOfStatement15.errors.txt
index 07aa6dd5b37..f0eab288fa7 100644
--- a/tests/baselines/reference/parserES5ForOfStatement15.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement15.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement15.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement15.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement15.ts (1 errors) ====
     for (var [a, b] of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement16.errors.txt b/tests/baselines/reference/parserES5ForOfStatement16.errors.txt
index 15a3e4f7f0b..b9248140f33 100644
--- a/tests/baselines/reference/parserES5ForOfStatement16.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement16.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement16.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement16.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement16.ts (1 errors) ====
     for (var {a, b} of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement18.errors.txt b/tests/baselines/reference/parserES5ForOfStatement18.errors.txt
index fc314e51012..e123be9c4f7 100644
--- a/tests/baselines/reference/parserES5ForOfStatement18.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement18.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement18.ts (1 errors) ====
     for (var of of of) { }
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
\ No newline at end of file
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement2.errors.txt b/tests/baselines/reference/parserES5ForOfStatement2.errors.txt
index 347ae29ddb8..618e2f3f0ae 100644
--- a/tests/baselines/reference/parserES5ForOfStatement2.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement2.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement2.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement2.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement2.ts (1 errors) ====
     for (var of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement21.errors.txt b/tests/baselines/reference/parserES5ForOfStatement21.errors.txt
index 2ddbf4b5666..14d97f49faf 100644
--- a/tests/baselines/reference/parserES5ForOfStatement21.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement21.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement21.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement21.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement21.ts (1 errors) ====
     for (var of of) { }
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
\ No newline at end of file
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement3.errors.txt b/tests/baselines/reference/parserES5ForOfStatement3.errors.txt
index 553ca40aee0..dd888a3120a 100644
--- a/tests/baselines/reference/parserES5ForOfStatement3.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement3.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement3.ts (1 errors) ====
     for (var a, b of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement4.errors.txt b/tests/baselines/reference/parserES5ForOfStatement4.errors.txt
index 6a08c8942ed..b94de56b17c 100644
--- a/tests/baselines/reference/parserES5ForOfStatement4.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement4.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts (1 errors) ====
     for (var a = 1 of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement5.errors.txt b/tests/baselines/reference/parserES5ForOfStatement5.errors.txt
index 212eae8ac10..0b8dafc0b90 100644
--- a/tests/baselines/reference/parserES5ForOfStatement5.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement5.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement5.ts (1 errors) ====
     for (var a: number of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement6.errors.txt b/tests/baselines/reference/parserES5ForOfStatement6.errors.txt
index e331b66eb85..04ac84fbd73 100644
--- a/tests/baselines/reference/parserES5ForOfStatement6.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement6.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement6.ts (1 errors) ====
     for (var a = 1, b = 2 of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement7.errors.txt b/tests/baselines/reference/parserES5ForOfStatement7.errors.txt
index 5ba60c264eb..1def5279f65 100644
--- a/tests/baselines/reference/parserES5ForOfStatement7.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement7.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement7.ts (1 errors) ====
     for (var a: number = 1, b: string = "" of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement8.errors.txt b/tests/baselines/reference/parserES5ForOfStatement8.errors.txt
index 3696bf11f8c..829fea57e6e 100644
--- a/tests/baselines/reference/parserES5ForOfStatement8.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement8.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement8.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement8.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement8.ts (1 errors) ====
     for (var v of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement9.errors.txt b/tests/baselines/reference/parserES5ForOfStatement9.errors.txt
index 6e2e9d05705..4cf082b4f15 100644
--- a/tests/baselines/reference/parserES5ForOfStatement9.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement9.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement9.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement9.ts(1,1): error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement9.ts (1 errors) ====
     for (let v of X) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS2482: 'for...of' statements are only available when targeting ECMAScript 6 or higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement1.d.errors.txt b/tests/baselines/reference/parserForOfStatement1.d.errors.txt
index 05af0a6f775..3b1b2a65922 100644
--- a/tests/baselines/reference/parserForOfStatement1.d.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement1.d.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement1.d.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement1.d.ts(1,1): error TS1036: Statements are not allowed in ambient contexts.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement1.d.ts (1 errors) ====
     for (var i of e) {
     ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+!!! error TS1036: Statements are not allowed in ambient contexts.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement10.errors.txt b/tests/baselines/reference/parserForOfStatement10.errors.txt
deleted file mode 100644
index 570c319b51f..00000000000
--- a/tests/baselines/reference/parserForOfStatement10.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement10.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement10.ts (1 errors) ====
-    for (const v of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement11.errors.txt b/tests/baselines/reference/parserForOfStatement11.errors.txt
deleted file mode 100644
index f253a2d4295..00000000000
--- a/tests/baselines/reference/parserForOfStatement11.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement11.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement11.ts (1 errors) ====
-    for (const [a, b] of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement12.errors.txt b/tests/baselines/reference/parserForOfStatement12.errors.txt
deleted file mode 100644
index 07ef4498984..00000000000
--- a/tests/baselines/reference/parserForOfStatement12.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement12.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement12.ts (1 errors) ====
-    for (const {a, b} of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement13.errors.txt b/tests/baselines/reference/parserForOfStatement13.errors.txt
deleted file mode 100644
index 6c10a7b0582..00000000000
--- a/tests/baselines/reference/parserForOfStatement13.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement13.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement13.ts (1 errors) ====
-    for (let {a, b} of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement14.errors.txt b/tests/baselines/reference/parserForOfStatement14.errors.txt
deleted file mode 100644
index 209a39c0513..00000000000
--- a/tests/baselines/reference/parserForOfStatement14.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement14.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement14.ts (1 errors) ====
-    for (let [a, b] of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement15.errors.txt b/tests/baselines/reference/parserForOfStatement15.errors.txt
deleted file mode 100644
index c5fd77af299..00000000000
--- a/tests/baselines/reference/parserForOfStatement15.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement15.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement15.ts (1 errors) ====
-    for (var [a, b] of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement16.errors.txt b/tests/baselines/reference/parserForOfStatement16.errors.txt
deleted file mode 100644
index d169eef1256..00000000000
--- a/tests/baselines/reference/parserForOfStatement16.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement16.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement16.ts (1 errors) ====
-    for (var {a, b} of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement18.errors.txt b/tests/baselines/reference/parserForOfStatement18.errors.txt
deleted file mode 100644
index 9312af76fc1..00000000000
--- a/tests/baselines/reference/parserForOfStatement18.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement18.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement18.ts (1 errors) ====
-    for (var of of of) { }
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement2.errors.txt b/tests/baselines/reference/parserForOfStatement2.errors.txt
index 8e7da497308..7229fe4196d 100644
--- a/tests/baselines/reference/parserForOfStatement2.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement2.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement2.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement2.ts(1,9): error TS1123: Variable declaration list cannot be empty.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement2.ts (1 errors) ====
     for (var of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+            
+!!! error TS1123: Variable declaration list cannot be empty.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement21.errors.txt b/tests/baselines/reference/parserForOfStatement21.errors.txt
index dad48f415cd..9103e2fedee 100644
--- a/tests/baselines/reference/parserForOfStatement21.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement21.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement21.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement21.ts(1,9): error TS1123: Variable declaration list cannot be empty.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement21.ts (1 errors) ====
     for (var of of) { }
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
\ No newline at end of file
+            
+!!! error TS1123: Variable declaration list cannot be empty.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement3.errors.txt b/tests/baselines/reference/parserForOfStatement3.errors.txt
index 83985f1a710..995ef4637c2 100644
--- a/tests/baselines/reference/parserForOfStatement3.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement3.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement3.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement3.ts(1,13): error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement3.ts (1 errors) ====
     for (var a, b of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+                ~
+!!! error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement4.errors.txt b/tests/baselines/reference/parserForOfStatement4.errors.txt
index 94dd08ed597..65b4bf342f2 100644
--- a/tests/baselines/reference/parserForOfStatement4.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement4.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement4.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement4.ts(1,10): error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement4.ts (1 errors) ====
     for (var a = 1 of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+             ~
+!!! error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement5.errors.txt b/tests/baselines/reference/parserForOfStatement5.errors.txt
index 6570f4a0755..13fd8739866 100644
--- a/tests/baselines/reference/parserForOfStatement5.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement5.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement5.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement5.ts(1,10): error TS2483: The left-hand side of a 'for...of' statement cannot use a type annotation.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement5.ts (1 errors) ====
     for (var a: number of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+             ~
+!!! error TS2483: The left-hand side of a 'for...of' statement cannot use a type annotation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement6.errors.txt b/tests/baselines/reference/parserForOfStatement6.errors.txt
index 6208749911f..57d95361b65 100644
--- a/tests/baselines/reference/parserForOfStatement6.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement6.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement6.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement6.ts(1,17): error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement6.ts (1 errors) ====
     for (var a = 1, b = 2 of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+                    ~
+!!! error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement7.errors.txt b/tests/baselines/reference/parserForOfStatement7.errors.txt
index 1810daad5ee..07f93c263ec 100644
--- a/tests/baselines/reference/parserForOfStatement7.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement7.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement7.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
+tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement7.ts(1,25): error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement7.ts (1 errors) ====
     for (var a: number = 1, b: string = "" of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
+                            ~
+!!! error TS1188: Only a single variable declaration is allowed in a 'for...of' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement8.errors.txt b/tests/baselines/reference/parserForOfStatement8.errors.txt
deleted file mode 100644
index 8e2c41d0cef..00000000000
--- a/tests/baselines/reference/parserForOfStatement8.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement8.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement8.ts (1 errors) ====
-    for (var v of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement9.errors.txt b/tests/baselines/reference/parserForOfStatement9.errors.txt
deleted file mode 100644
index 01fd729e9cd..00000000000
--- a/tests/baselines/reference/parserForOfStatement9.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement9.ts(1,1): error TS9003: 'for...of' statements are not currently supported.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement9.ts (1 errors) ====
-    for (let v of X) {
-    ~~~
-!!! error TS9003: 'for...of' statements are not currently supported.
-    }
\ No newline at end of file