diff --git a/test/language/expressions/arrow-function/scope-body-lex-distinct.js b/test/language/expressions/arrow-function/scope-body-lex-distinct.js
new file mode 100644
index 0000000000..9416b7fdc3
--- /dev/null
+++ b/test/language/expressions/arrow-function/scope-body-lex-distinct.js
@@ -0,0 +1,48 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+var a = () => { let x; eval('var x;'); };
+
+assert.throws(SyntaxError, a);
diff --git a/test/language/expressions/generators/scope-body-lex-distinct.js b/test/language/expressions/generators/scope-body-lex-distinct.js
new file mode 100644
index 0000000000..f793b54985
--- /dev/null
+++ b/test/language/expressions/generators/scope-body-lex-distinct.js
@@ -0,0 +1,54 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+var g = function*() {
+  let x;
+  eval('var x;');
+};
+var iter = g();
+
+assert.throws(SyntaxError, function() {
+  iter.next();
+});
diff --git a/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js b/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js
new file mode 100644
index 0000000000..6ddc563132
--- /dev/null
+++ b/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js
@@ -0,0 +1,56 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+var o = {
+  *m() {
+    let x;
+    eval('var x;');
+  }
+};
+var iter = o.m();
+
+assert.throws(SyntaxError, function() {
+  iter.next();
+});
diff --git a/test/language/expressions/object/scope-getter-body-lex-distinc.js b/test/language/expressions/object/scope-getter-body-lex-distinc.js
new file mode 100644
index 0000000000..7649bb6ad7
--- /dev/null
+++ b/test/language/expressions/object/scope-getter-body-lex-distinc.js
@@ -0,0 +1,55 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+var o = {
+  get a() {
+    let x;
+    eval('var x;');
+  }
+};
+
+assert.throws(SyntaxError, function() {
+  o.a;
+});
diff --git a/test/language/expressions/object/scope-meth-body-lex-distinct.js b/test/language/expressions/object/scope-meth-body-lex-distinct.js
new file mode 100644
index 0000000000..3c84edb0e6
--- /dev/null
+++ b/test/language/expressions/object/scope-meth-body-lex-distinct.js
@@ -0,0 +1,53 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+var m = {
+  m() {
+    let x;
+    eval('var x;');
+  }
+}.m;
+
+assert.throws(SyntaxError, m);
diff --git a/test/language/expressions/object/scope-setter-body-lex-distinc.js b/test/language/expressions/object/scope-setter-body-lex-distinc.js
new file mode 100644
index 0000000000..6e31ea3e61
--- /dev/null
+++ b/test/language/expressions/object/scope-setter-body-lex-distinc.js
@@ -0,0 +1,55 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+var o = {
+  set a(_) {
+    let x;
+    eval('var x;');
+  }
+};
+
+assert.throws(SyntaxError, function() {
+  o.a = null;
+});
diff --git a/test/language/statements/function/scope-body-lex-distinct.js b/test/language/statements/function/scope-body-lex-distinct.js
new file mode 100644
index 0000000000..55e1a5a558
--- /dev/null
+++ b/test/language/statements/function/scope-body-lex-distinct.js
@@ -0,0 +1,53 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+function f() {
+  let x;
+  eval('var x;');
+}
+
+assert.throws(SyntaxError, function() {
+  f();
+});
diff --git a/test/language/statements/generators/scope-body-lex-distinct.js b/test/language/statements/generators/scope-body-lex-distinct.js
new file mode 100644
index 0000000000..9506c1b85d
--- /dev/null
+++ b/test/language/statements/generators/scope-body-lex-distinct.js
@@ -0,0 +1,54 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-functiondeclarationinstantiation
+description: >
+    Creation of new lexical environment (distinct from the variable
+    environment) for the function body outside of strict mode
+info: |
+    [...]
+    29. If strict is false, then
+        a. Let lexEnv be NewDeclarativeEnvironment(varEnv).
+        b. NOTE: Non-strict functions use a separate lexical Environment Record
+           for top-level lexical declarations so that a direct eval can
+           determine whether any var scoped declarations introduced by the eval
+           code conflict with pre-existing top-level lexically scoped
+           declarations.  This is not needed for strict functions because a
+           strict direct eval always places all declarations into a new
+           Environment Record.
+    [...]
+
+    18.2.1.3 Runtime Semantics: EvalDeclarationInstantiation
+
+    [...]
+    5. If strict is false, then
+       [...]
+       b. Let thisLex be lexEnv.
+       c. Assert: The following loop will terminate.
+       d. Repeat while thisLex is not the same as varEnv,
+          i. Let thisEnvRec be thisLex's EnvironmentRecord.
+          ii. If thisEnvRec is not an object Environment Record, then
+              1. NOTE: The environment of with statements cannot contain any
+                 lexical declaration so it doesn't need to be checked for
+                 var/let hoisting conflicts.
+              2. For each name in varNames, do
+                 a. If thisEnvRec.HasBinding(name) is true, then
+                    i. Throw a SyntaxError exception.
+                    ii. NOTE: Annex B.3.5 defines alternate semantics for the
+                        above step.
+                 b. NOTE: A direct eval will not hoist var declaration over a
+                    like-named lexical declaration.
+          iii. Let thisLex be thisLex's outer environment reference.
+flags: [noStrict]
+features: [let]
+---*/
+
+function* g() {
+  let x;
+  eval('var x;');
+}
+var iter = g();
+
+assert.throws(SyntaxError, function() {
+  iter.next();
+});