diff --git a/test/language/block-scope/syntax/for-in/mixed-values-in-iteration.js b/test/language/block-scope/syntax/for-in/mixed-values-in-iteration.js
index 163fed0386..37d78d8c66 100644
--- a/test/language/block-scope/syntax/for-in/mixed-values-in-iteration.js
+++ b/test/language/block-scope/syntax/for-in/mixed-values-in-iteration.js
@@ -5,7 +5,6 @@ es6id: 13.1
 description: >
     Mixed values in iteration
 ---*/
-"use strict";
 function fn(x) {
   let a = [];
   for (let p in x) {
diff --git a/test/language/block-scope/semantics/const/block-local-closure-get-before-initialization.js b/test/language/statements/const/block-local-closure-get-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/const/block-local-closure-get-before-initialization.js
rename to test/language/statements/const/block-local-closure-get-before-initialization.js
diff --git a/test/language/block-scope/semantics/const/block-local-use-before-initialization-in-declaration-statement.js b/test/language/statements/const/block-local-use-before-initialization-in-declaration-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/const/block-local-use-before-initialization-in-declaration-statement.js
rename to test/language/statements/const/block-local-use-before-initialization-in-declaration-statement.js
diff --git a/test/language/block-scope/semantics/const/block-local-use-before-initialization-in-prior-statement.js b/test/language/statements/const/block-local-use-before-initialization-in-prior-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/const/block-local-use-before-initialization-in-prior-statement.js
rename to test/language/statements/const/block-local-use-before-initialization-in-prior-statement.js
diff --git a/test/language/block-scope/semantics/const/function-local-closure-get-before-initialization.js b/test/language/statements/const/function-local-closure-get-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/const/function-local-closure-get-before-initialization.js
rename to test/language/statements/const/function-local-closure-get-before-initialization.js
diff --git a/test/language/block-scope/semantics/const/function-local-use-before-initialization-in-declaration-statement.js b/test/language/statements/const/function-local-use-before-initialization-in-declaration-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/const/function-local-use-before-initialization-in-declaration-statement.js
rename to test/language/statements/const/function-local-use-before-initialization-in-declaration-statement.js
diff --git a/test/language/block-scope/semantics/const/function-local-use-before-initialization-in-prior-statement.js b/test/language/statements/const/function-local-use-before-initialization-in-prior-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/const/function-local-use-before-initialization-in-prior-statement.js
rename to test/language/statements/const/function-local-use-before-initialization-in-prior-statement.js
diff --git a/test/language/block-scope/semantics/const/global-closure-get-before-initialization.js b/test/language/statements/const/global-closure-get-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/const/global-closure-get-before-initialization.js
rename to test/language/statements/const/global-closure-get-before-initialization.js
diff --git a/test/language/block-scope/semantics/const/global-use-before-initialization-in-declaration-statement.js b/test/language/statements/const/global-use-before-initialization-in-declaration-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/const/global-use-before-initialization-in-declaration-statement.js
rename to test/language/statements/const/global-use-before-initialization-in-declaration-statement.js
diff --git a/test/language/block-scope/semantics/const/global-use-before-initialization-in-prior-statement.js b/test/language/statements/const/global-use-before-initialization-in-prior-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/const/global-use-before-initialization-in-prior-statement.js
rename to test/language/statements/const/global-use-before-initialization-in-prior-statement.js
diff --git a/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js b/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js
new file mode 100644
index 0000000000..7077a0fdb5
--- /dev/null
+++ b/test/language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js
@@ -0,0 +1,11 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.1
+description: >
+    Redeclaration error within strict mode function inside non-strict code.
+negative: SyntaxError
+flags: [noStrict]
+---*/
+(function() { 'use strict'; { const f = 1; var f; } })
+
diff --git a/test/language/block-scope/syntax/const-declaration/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js
rename to test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-with-without-initialiser.js
diff --git a/test/language/block-scope/syntax/const-declaration/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js
rename to test/language/statements/const/syntax/block-scope-syntax-const-declarations-mixed-without-with-initialiser.js
diff --git a/test/language/block-scope/syntax/const-declaration/block-scope-syntax-const-declarations-without-initialiser.js b/test/language/statements/const/syntax/block-scope-syntax-const-declarations-without-initialiser.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/block-scope-syntax-const-declarations-without-initialiser.js
rename to test/language/statements/const/syntax/block-scope-syntax-const-declarations-without-initialiser.js
diff --git a/test/language/block-scope/syntax/for-loop/const-invalid-assignment-next-expression.js b/test/language/statements/const/syntax/const-invalid-assignment-next-expression-for.js
similarity index 80%
rename from test/language/block-scope/syntax/for-loop/const-invalid-assignment-next-expression.js
rename to test/language/statements/const/syntax/const-invalid-assignment-next-expression-for.js
index 8e5055f7de..ab56909403 100644
--- a/test/language/block-scope/syntax/for-loop/const-invalid-assignment-next-expression.js
+++ b/test/language/statements/const/syntax/const-invalid-assignment-next-expression-for.js
@@ -1,10 +1,10 @@
 // Copyright (C) 2015 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 13.1
+es6id: 13.6.3.7_S5.a.i
 description: >
     const: invalid assignment in next expression
 negative: TypeError
 ---*/
 
-for (const i = 0; i < 1; i++) { }
+for (const i = 0; i < 1; i++) {}
diff --git a/test/language/statements/const/syntax/const-invalid-assignment-statement-body-for-in.js b/test/language/statements/const/syntax/const-invalid-assignment-statement-body-for-in.js
new file mode 100644
index 0000000000..82a9a69981
--- /dev/null
+++ b/test/language/statements/const/syntax/const-invalid-assignment-statement-body-for-in.js
@@ -0,0 +1,10 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.10_S1.a.i
+description: >
+    const: invalid assignment in Statement body
+negative: TypeError
+---*/
+
+for (const x in [1, 2, 3]) { x++ }
diff --git a/test/language/statements/const/syntax/const-invalid-assignment-statement-body-for-of.js b/test/language/statements/const/syntax/const-invalid-assignment-statement-body-for-of.js
new file mode 100644
index 0000000000..824fcc563d
--- /dev/null
+++ b/test/language/statements/const/syntax/const-invalid-assignment-statement-body-for-of.js
@@ -0,0 +1,10 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.10_S1.a.i
+description: >
+    const: invalid assignment in Statement body
+negative: TypeError
+---*/
+
+for (const x of [1, 2, 3]) { x++ }
diff --git a/test/language/block-scope/syntax/for-loop/const-outer-inner-let-bindings.js b/test/language/statements/const/syntax/const-outer-inner-let-bindings.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/const-outer-inner-let-bindings.js
rename to test/language/statements/const/syntax/const-outer-inner-let-bindings.js
diff --git a/test/language/block-scope/syntax/global-and-block/const.js b/test/language/statements/const/syntax/const.js
similarity index 100%
rename from test/language/block-scope/syntax/global-and-block/const.js
rename to test/language/statements/const/syntax/const.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-case-expression-statement-list.js b/test/language/statements/const/syntax/with-initializer-case-expression-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-case-expression-statement-list.js
rename to test/language/statements/const/syntax/with-initializer-case-expression-statement-list.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-default-statement-list.js b/test/language/statements/const/syntax/with-initializer-default-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-default-statement-list.js
rename to test/language/statements/const/syntax/with-initializer-default-statement-list.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-do-statement-while-expression.js b/test/language/statements/const/syntax/with-initializer-do-statement-while-expression.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-do-statement-while-expression.js
rename to test/language/statements/const/syntax/with-initializer-do-statement-while-expression.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-for-statement.js b/test/language/statements/const/syntax/with-initializer-for-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-for-statement.js
rename to test/language/statements/const/syntax/with-initializer-for-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-if-expression-statement-else-statement.js b/test/language/statements/const/syntax/with-initializer-if-expression-statement-else-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-if-expression-statement-else-statement.js
rename to test/language/statements/const/syntax/with-initializer-if-expression-statement-else-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-if-expression-statement.js b/test/language/statements/const/syntax/with-initializer-if-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-if-expression-statement.js
rename to test/language/statements/const/syntax/with-initializer-if-expression-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-label-statement.js b/test/language/statements/const/syntax/with-initializer-label-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-label-statement.js
rename to test/language/statements/const/syntax/with-initializer-label-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/with-initializer-while-expression-statement.js b/test/language/statements/const/syntax/with-initializer-while-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/with-initializer-while-expression-statement.js
rename to test/language/statements/const/syntax/with-initializer-while-expression-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-case-expression-statement-list.js b/test/language/statements/const/syntax/without-initializer-case-expression-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-case-expression-statement-list.js
rename to test/language/statements/const/syntax/without-initializer-case-expression-statement-list.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-default-statement-list.js b/test/language/statements/const/syntax/without-initializer-default-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-default-statement-list.js
rename to test/language/statements/const/syntax/without-initializer-default-statement-list.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-do-statement-while-expression.js b/test/language/statements/const/syntax/without-initializer-do-statement-while-expression.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-do-statement-while-expression.js
rename to test/language/statements/const/syntax/without-initializer-do-statement-while-expression.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-for-statement.js b/test/language/statements/const/syntax/without-initializer-for-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-for-statement.js
rename to test/language/statements/const/syntax/without-initializer-for-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-if-expression-statement-else-statement.js b/test/language/statements/const/syntax/without-initializer-if-expression-statement-else-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-if-expression-statement-else-statement.js
rename to test/language/statements/const/syntax/without-initializer-if-expression-statement-else-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-if-expression-statement.js b/test/language/statements/const/syntax/without-initializer-if-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-if-expression-statement.js
rename to test/language/statements/const/syntax/without-initializer-if-expression-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-label-statement.js b/test/language/statements/const/syntax/without-initializer-label-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-label-statement.js
rename to test/language/statements/const/syntax/without-initializer-label-statement.js
diff --git a/test/language/block-scope/syntax/const-declaration/without-initializer-while-expression-statement.js b/test/language/statements/const/syntax/without-initializer-while-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/const-declaration/without-initializer-while-expression-statement.js
rename to test/language/statements/const/syntax/without-initializer-while-expression-statement.js
diff --git a/test/language/statements/continue/labeled-continue.js b/test/language/statements/continue/labeled-continue.js
new file mode 100644
index 0000000000..a3e90b7316
--- /dev/null
+++ b/test/language/statements/continue/labeled-continue.js
@@ -0,0 +1,16 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    labeled continue
+---*/
+var count = 0;
+label: for (let x = 0; x < 10;) {
+  while (true) {
+    x++;
+    count++;
+    continue label;
+  }
+}
+assert.sameValue(count, 10, "The value of `count` is `10`");
diff --git a/test/language/statements/continue/nested-let-bound-for-loops-inner-continue.js b/test/language/statements/continue/nested-let-bound-for-loops-inner-continue.js
new file mode 100644
index 0000000000..283785185a
--- /dev/null
+++ b/test/language/statements/continue/nested-let-bound-for-loops-inner-continue.js
@@ -0,0 +1,17 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    nested let bound for loops inner continue
+---*/
+var count = 0;
+for (let x = 0; x < 10;) {
+  x++;
+  for (let y = 0; y < 2;) {
+    y++;
+    count++;
+    continue;
+  }
+}
+assert.sameValue(count, 20, "The value of `count` is `20`");
diff --git a/test/language/statements/continue/nested-let-bound-for-loops-labeled-continue.js b/test/language/statements/continue/nested-let-bound-for-loops-labeled-continue.js
new file mode 100644
index 0000000000..d242c3aafd
--- /dev/null
+++ b/test/language/statements/continue/nested-let-bound-for-loops-labeled-continue.js
@@ -0,0 +1,17 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    nested let bound for loops labeled continue
+---*/
+var count = 0;
+outer: for (let x = 0; x < 10;) {
+  x++;
+  for (let y = 0; y < 2;) {
+    y++;
+    count++;
+    if (y == 2) continue outer;
+  }
+}
+assert.sameValue(count, 20, "The value of `count` is `20`");
diff --git a/test/language/statements/continue/nested-let-bound-for-loops-outer-continue.js b/test/language/statements/continue/nested-let-bound-for-loops-outer-continue.js
new file mode 100644
index 0000000000..9453a74c61
--- /dev/null
+++ b/test/language/statements/continue/nested-let-bound-for-loops-outer-continue.js
@@ -0,0 +1,17 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    nested let bound for loops outer continue
+---*/
+var count = 0;
+for (let x = 0; x < 10;) {
+  x++;
+  for (let y = 0; y < 2;) {
+    y++;
+    count++;
+  }
+  continue;
+}
+assert.sameValue(count, 20, "The value of `count` is `20`");
diff --git a/test/language/statements/continue/no-label-continue.js b/test/language/statements/continue/no-label-continue.js
new file mode 100644
index 0000000000..26ac85560b
--- /dev/null
+++ b/test/language/statements/continue/no-label-continue.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    no label continue
+---*/
+var count = 0;
+for (let x = 0; x < 10;) {
+  x++;
+  count++;
+  continue;
+}
+assert.sameValue(count, 10, "The value of `count` is `10`");
+
diff --git a/test/language/statements/continue/shadowing-loop-variable-in-same-scope-as-continue.js b/test/language/statements/continue/shadowing-loop-variable-in-same-scope-as-continue.js
new file mode 100644
index 0000000000..35ac2978ac
--- /dev/null
+++ b/test/language/statements/continue/shadowing-loop-variable-in-same-scope-as-continue.js
@@ -0,0 +1,17 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    shadowing loop variable in same scope as continue
+---*/
+var count = 0;
+for (let x = 0; x < 10;) {
+  x++;
+  count++;
+  {
+    let x = "hello";
+    continue;
+  }
+}
+assert.sameValue(count, 10, "The value of `count` is `10`");
diff --git a/test/language/statements/continue/simple-and-labeled.js b/test/language/statements/continue/simple-and-labeled.js
new file mode 100644
index 0000000000..324563fe48
--- /dev/null
+++ b/test/language/statements/continue/simple-and-labeled.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.12
+description: >
+    basic labeled for loop with continue
+---*/
+var count = 0;
+label: for (let x = 0; x < 10;) {
+  x++;
+  count++;
+  continue label;
+}
+assert.sameValue(count, 10, "The value of `count` is `10`");
+
diff --git a/test/language/statements/for-in/const-bound-names-fordecl-tdz-for-in.js b/test/language/statements/for-in/const-bound-names-fordecl-tdz-for-in.js
new file mode 100644
index 0000000000..dab2df3be2
--- /dev/null
+++ b/test/language/statements/for-in/const-bound-names-fordecl-tdz-for-in.js
@@ -0,0 +1,12 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.12_S2
+description: >
+    ForIn/Of: Bound names of ForDeclaration are in TDZ (for-of)
+negative: ReferenceError
+---*/
+
+let x = 1;
+for (const x in { x }) {}
+
diff --git a/test/language/statements/for-in/const-fresh-binding-per-iteration-for-in.js b/test/language/statements/for-in/const-fresh-binding-per-iteration-for-in.js
new file mode 100644
index 0000000000..d988eec67c
--- /dev/null
+++ b/test/language/statements/for-in/const-fresh-binding-per-iteration-for-in.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.13
+description: >
+    const ForDeclaration: creates a fresh binding per iteration
+---*/
+
+let s = '';
+for (const x of [1, 2, 3]) {
+  s += x;
+}
+assert.sameValue(s, '123', "The value of `s` is `'123'`");
+
+
diff --git a/test/language/statements/for-in/let-bound-names-fordecl-tdz-for-in.js b/test/language/statements/for-in/let-bound-names-fordecl-tdz-for-in.js
new file mode 100644
index 0000000000..ed742fb27e
--- /dev/null
+++ b/test/language/statements/for-in/let-bound-names-fordecl-tdz-for-in.js
@@ -0,0 +1,12 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.12_S2
+description: >
+    ForIn/Of: Bound names of ForDeclaration are in TDZ (for-of)
+negative: ReferenceError
+---*/
+
+let x = 1;
+for (let x in { x }) {}
+
diff --git a/test/language/statements/for-in/let-fresh-binding-per-iteration-for-in.js b/test/language/statements/for-in/let-fresh-binding-per-iteration-for-in.js
new file mode 100644
index 0000000000..9829580726
--- /dev/null
+++ b/test/language/statements/for-in/let-fresh-binding-per-iteration-for-in.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.13
+description: >
+    let ForDeclaration: creates a fresh binding per iteration
+---*/
+
+let s = '';
+for (let x of [1, 2, 3]) {
+  s += x;
+}
+assert.sameValue(s, '123', "The value of `s` is `'123'`");
+
+
diff --git a/test/language/statements/for-of/const-bound-names-fordecl-tdz-for-of.js b/test/language/statements/for-of/const-bound-names-fordecl-tdz-for-of.js
new file mode 100644
index 0000000000..09a1c87555
--- /dev/null
+++ b/test/language/statements/for-of/const-bound-names-fordecl-tdz-for-of.js
@@ -0,0 +1,12 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.12_S2
+description: >
+    ForIn/Of: Bound names of ForDeclaration are in TDZ (for-of)
+negative: ReferenceError
+---*/
+
+let x = 1;
+for (const x of [x]) {}
+
diff --git a/test/language/statements/for-of/const-fresh-binding-per-iteration-for-of.js b/test/language/statements/for-of/const-fresh-binding-per-iteration-for-of.js
new file mode 100644
index 0000000000..9c2b5eedf5
--- /dev/null
+++ b/test/language/statements/for-of/const-fresh-binding-per-iteration-for-of.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.13
+description: >
+    const ForDeclaration: creates a fresh binding per iteration
+---*/
+
+let s = 0;
+let f = [undefined, undefined, undefined];
+
+for (const x of [1, 2, 3]) {
+  s += x;
+  f[x-1] = function() { return x; }
+}
+assert.sameValue(s, 6, "The value of `s` is `6`");
+assert.sameValue(f[0](), 1, "`f[0]()` returns `1`");
+assert.sameValue(f[1](), 2, "`f[1]()` returns `2`");
+assert.sameValue(f[2](), 3, "`f[2]()` returns `3`");
diff --git a/test/language/statements/for-of/let-bound-names-fordecl-tdz-for-of.js b/test/language/statements/for-of/let-bound-names-fordecl-tdz-for-of.js
new file mode 100644
index 0000000000..eaa453c796
--- /dev/null
+++ b/test/language/statements/for-of/let-bound-names-fordecl-tdz-for-of.js
@@ -0,0 +1,12 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.12_S2
+description: >
+    ForIn/Of: Bound names of ForDeclaration are in TDZ (for-of)
+negative: ReferenceError
+---*/
+
+let x = 1;
+for (let x of [x]) {}
+
diff --git a/test/language/statements/for-of/let-fresh-binding-per-iteration-for-of.js b/test/language/statements/for-of/let-fresh-binding-per-iteration-for-of.js
new file mode 100644
index 0000000000..870275807a
--- /dev/null
+++ b/test/language/statements/for-of/let-fresh-binding-per-iteration-for-of.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.13
+description: >
+    let ForDeclaration: creates a fresh binding per iteration
+---*/
+
+let s = 0;
+let f = [undefined, undefined, undefined];
+
+for (let x of [1, 2, 3]) {
+  s += x;
+  f[x-1] = function() { return x; }
+}
+assert.sameValue(s, 6, "The value of `s` is `6`");
+assert.sameValue(f[0](), 1, "`f[0]()` returns `1`");
+assert.sameValue(f[1](), 2, "`f[1]()` returns `2`");
+assert.sameValue(f[2](), 3, "`f[2]()` returns `3`");
diff --git a/test/language/statements/for/const-fresh-binding-per-iteration-for.js b/test/language/statements/for/const-fresh-binding-per-iteration-for.js
new file mode 100644
index 0000000000..50fcf16046
--- /dev/null
+++ b/test/language/statements/for/const-fresh-binding-per-iteration-for.js
@@ -0,0 +1,14 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.13
+description: >
+    const ForDeclaration: creates a fresh binding per iteration
+---*/
+
+let z = 1;
+let s = 0;
+for (const x = 1; z < 2; z++) {
+  s += x + z;
+}
+assert.sameValue(s, 2, "The value of `s` is `2`");
diff --git a/test/language/statements/for/let-fresh-binding-per-iteration-for.js b/test/language/statements/for/let-fresh-binding-per-iteration-for.js
new file mode 100644
index 0000000000..ae8d98f4b5
--- /dev/null
+++ b/test/language/statements/for/let-fresh-binding-per-iteration-for.js
@@ -0,0 +1,14 @@
+// Copyright (C) 2011 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.6.4.13
+description: >
+    let ForDeclaration: creates a fresh binding per iteration
+---*/
+
+let z = 1;
+let s = 0;
+for (let x = 1; z < 2; z++) {
+  s += x + z;
+}
+assert.sameValue(s, 2, "The value of `s` is `2`");
diff --git a/test/language/block-scope/semantics/let/block-local-closure-get-before-initialization.js b/test/language/statements/let/block-local-closure-get-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/let/block-local-closure-get-before-initialization.js
rename to test/language/statements/let/block-local-closure-get-before-initialization.js
diff --git a/test/language/block-scope/semantics/let/block-local-closure-set-before-initialization.js b/test/language/statements/let/block-local-closure-set-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/let/block-local-closure-set-before-initialization.js
rename to test/language/statements/let/block-local-closure-set-before-initialization.js
diff --git a/test/language/block-scope/semantics/let/block-local-use-before-initialization-in-declaration-statement.js b/test/language/statements/let/block-local-use-before-initialization-in-declaration-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/let/block-local-use-before-initialization-in-declaration-statement.js
rename to test/language/statements/let/block-local-use-before-initialization-in-declaration-statement.js
diff --git a/test/language/block-scope/semantics/let/block-local-use-before-initialization-in-prior-statement.js b/test/language/statements/let/block-local-use-before-initialization-in-prior-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/let/block-local-use-before-initialization-in-prior-statement.js
rename to test/language/statements/let/block-local-use-before-initialization-in-prior-statement.js
diff --git a/test/language/block-scope/semantics/let/function-local-closure-get-before-initialization.js b/test/language/statements/let/function-local-closure-get-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/let/function-local-closure-get-before-initialization.js
rename to test/language/statements/let/function-local-closure-get-before-initialization.js
diff --git a/test/language/block-scope/semantics/let/function-local-closure-set-before-initialization.js b/test/language/statements/let/function-local-closure-set-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/let/function-local-closure-set-before-initialization.js
rename to test/language/statements/let/function-local-closure-set-before-initialization.js
diff --git a/test/language/block-scope/semantics/let/function-local-use-before-initialization-in-declaration-statement.js b/test/language/statements/let/function-local-use-before-initialization-in-declaration-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/let/function-local-use-before-initialization-in-declaration-statement.js
rename to test/language/statements/let/function-local-use-before-initialization-in-declaration-statement.js
diff --git a/test/language/block-scope/semantics/let/function-local-use-before-initialization-in-prior-statement.js b/test/language/statements/let/function-local-use-before-initialization-in-prior-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/let/function-local-use-before-initialization-in-prior-statement.js
rename to test/language/statements/let/function-local-use-before-initialization-in-prior-statement.js
diff --git a/test/language/block-scope/semantics/let/global-closure-get-before-initialization.js b/test/language/statements/let/global-closure-get-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/let/global-closure-get-before-initialization.js
rename to test/language/statements/let/global-closure-get-before-initialization.js
diff --git a/test/language/block-scope/semantics/let/global-closure-set-before-initialization.js b/test/language/statements/let/global-closure-set-before-initialization.js
similarity index 100%
rename from test/language/block-scope/semantics/let/global-closure-set-before-initialization.js
rename to test/language/statements/let/global-closure-set-before-initialization.js
diff --git a/test/language/block-scope/semantics/let/global-use-before-initialization-in-declaration-statement.js b/test/language/statements/let/global-use-before-initialization-in-declaration-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/let/global-use-before-initialization-in-declaration-statement.js
rename to test/language/statements/let/global-use-before-initialization-in-declaration-statement.js
diff --git a/test/language/block-scope/semantics/let/global-use-before-initialization-in-prior-statement.js b/test/language/statements/let/global-use-before-initialization-in-prior-statement.js
similarity index 100%
rename from test/language/block-scope/semantics/let/global-use-before-initialization-in-prior-statement.js
rename to test/language/statements/let/global-use-before-initialization-in-prior-statement.js
diff --git a/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js b/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js
new file mode 100644
index 0000000000..0f59463f14
--- /dev/null
+++ b/test/language/statements/let/redeclaration-error-from-within-strict-mode-function.js
@@ -0,0 +1,11 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 13.1
+description: >
+    Redeclaration error within strict mode function inside non-strict code.
+negative: SyntaxError
+flags: [noStrict]
+---*/
+(function() { 'use strict'; { let f; var f; } })
+
diff --git a/test/language/block-scope/syntax/redeclaration-in-block/attempt-to-redeclare-let-binding-with-function-declaration.js b/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js
similarity index 100%
rename from test/language/block-scope/syntax/redeclaration-in-block/attempt-to-redeclare-let-binding-with-function-declaration.js
rename to test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js
diff --git a/test/language/block-scope/syntax/redeclaration-in-block/attempt-to-redeclare-let-binding-with-var.js b/test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js
similarity index 100%
rename from test/language/block-scope/syntax/redeclaration-in-block/attempt-to-redeclare-let-binding-with-var.js
rename to test/language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js
diff --git a/test/language/block-scope/syntax/for-in/identifier-let-allowed-as-lefthandside-expression-non-strict.js b/test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-non-strict.js
similarity index 100%
rename from test/language/block-scope/syntax/for-in/identifier-let-allowed-as-lefthandside-expression-non-strict.js
rename to test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-non-strict.js
diff --git a/test/language/block-scope/syntax/for-in/identifier-let-allowed-as-lefthandside-expression-strict.js b/test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-strict.js
similarity index 100%
rename from test/language/block-scope/syntax/for-in/identifier-let-allowed-as-lefthandside-expression-strict.js
rename to test/language/statements/let/syntax/identifier-let-allowed-as-lefthandside-expression-strict.js
diff --git a/test/language/block-scope/syntax/for-in/identifier-let-disallowed-as-boundname.js b/test/language/statements/let/syntax/identifier-let-disallowed-as-boundname.js
similarity index 100%
rename from test/language/block-scope/syntax/for-in/identifier-let-disallowed-as-boundname.js
rename to test/language/statements/let/syntax/identifier-let-disallowed-as-boundname.js
diff --git a/test/language/block-scope/syntax/for-loop/let-closure-inside-condition.js b/test/language/statements/let/syntax/let-closure-inside-condition.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/let-closure-inside-condition.js
rename to test/language/statements/let/syntax/let-closure-inside-condition.js
diff --git a/test/language/block-scope/syntax/for-loop/let-closure-inside-initialization.js b/test/language/statements/let/syntax/let-closure-inside-initialization.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/let-closure-inside-initialization.js
rename to test/language/statements/let/syntax/let-closure-inside-initialization.js
diff --git a/test/language/block-scope/syntax/for-loop/let-closure-inside-next-expression.js b/test/language/statements/let/syntax/let-closure-inside-next-expression.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/let-closure-inside-next-expression.js
rename to test/language/statements/let/syntax/let-closure-inside-next-expression.js
diff --git a/test/language/block-scope/syntax/for-loop/let-iteration-variable-is-freshly-allocated-for-each-iteration-multi-let-binding.js b/test/language/statements/let/syntax/let-iteration-variable-is-freshly-allocated-for-each-iteration-multi-let-binding.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/let-iteration-variable-is-freshly-allocated-for-each-iteration-multi-let-binding.js
rename to test/language/statements/let/syntax/let-iteration-variable-is-freshly-allocated-for-each-iteration-multi-let-binding.js
diff --git a/test/language/block-scope/syntax/for-loop/let-iteration-variable-is-freshly-allocated-for-each-iteration-single-let-binding.js b/test/language/statements/let/syntax/let-iteration-variable-is-freshly-allocated-for-each-iteration-single-let-binding.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/let-iteration-variable-is-freshly-allocated-for-each-iteration-single-let-binding.js
rename to test/language/statements/let/syntax/let-iteration-variable-is-freshly-allocated-for-each-iteration-single-let-binding.js
diff --git a/test/language/block-scope/syntax/for-loop/let-outer-inner-let-bindings.js b/test/language/statements/let/syntax/let-outer-inner-let-bindings.js
similarity index 100%
rename from test/language/block-scope/syntax/for-loop/let-outer-inner-let-bindings.js
rename to test/language/statements/let/syntax/let-outer-inner-let-bindings.js
diff --git a/test/language/block-scope/syntax/global-and-block/let.js b/test/language/statements/let/syntax/let.js
similarity index 100%
rename from test/language/block-scope/syntax/global-and-block/let.js
rename to test/language/statements/let/syntax/let.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-case-expression-statement-list.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-case-expression-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-case-expression-statement-list.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-case-expression-statement-list.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-default-statement-list.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-default-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-default-statement-list.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-default-statement-list.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-do-statement-while-expression.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-do-statement-while-expression.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-do-statement-while-expression.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-do-statement-while-expression.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-for-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-for-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-for-statement.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-for-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement-else-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-if-expression-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-if-expression-statement.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-if-expression-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-label-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-label-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-label-statement.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-label-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-while-expression-statement.js b/test/language/statements/let/syntax/with-initialisers-in-statement-positions-while-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/with-initialisers-in-statement-positions-while-expression-statement.js
rename to test/language/statements/let/syntax/with-initialisers-in-statement-positions-while-expression-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-case-expression-statement-list.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-case-expression-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-case-expression-statement-list.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-case-expression-statement-list.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-default-statement-list.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-default-statement-list.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-default-statement-list.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-default-statement-list.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-do-statement-while-expression.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-do-statement-while-expression.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-do-statement-while-expression.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-do-statement-while-expression.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-for-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-for-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-for-statement.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-for-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement-else-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-if-expression-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-if-expression-statement.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-if-expression-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-label-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-label-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-label-statement.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-label-statement.js
diff --git a/test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-while-expression-statement.js b/test/language/statements/let/syntax/without-initialisers-in-statement-positions-while-expression-statement.js
similarity index 100%
rename from test/language/block-scope/syntax/let-declarations/without-initialisers-in-statement-positions-while-expression-statement.js
rename to test/language/statements/let/syntax/without-initialisers-in-statement-positions-while-expression-statement.js