diff --git a/test/language/arguments-object/10.6-10-c-ii-1.js b/test/language/arguments-object/10.6-10-c-ii-1.js
index c9ad44df8d..a2eb67ad7e 100644
--- a/test/language/arguments-object/10.6-10-c-ii-1.js
+++ b/test/language/arguments-object/10.6-10-c-ii-1.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-10-c-ii-1
 description: arguments[i] change with actual parameters
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-10-c-ii-2.js b/test/language/arguments-object/10.6-10-c-ii-2.js
index c1eee201f3..fb2463d7c9 100644
--- a/test/language/arguments-object/10.6-10-c-ii-2.js
+++ b/test/language/arguments-object/10.6-10-c-ii-2.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-10-c-ii-2
 description: arguments[i] map to actual parameter
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-12-1.js b/test/language/arguments-object/10.6-12-1.js
index 539b49c626..0a9d566931 100644
--- a/test/language/arguments-object/10.6-12-1.js
+++ b/test/language/arguments-object/10.6-12-1.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-12-1
 description: Accessing callee property of Arguments object is allowed
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-12-2.js b/test/language/arguments-object/10.6-12-2.js
index 2376d2c47a..050a8024d7 100644
--- a/test/language/arguments-object/10.6-12-2.js
+++ b/test/language/arguments-object/10.6-12-2.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-12-2
 description: arguments.callee has correct attributes
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-13-1.js b/test/language/arguments-object/10.6-13-1.js
index 3def632fd7..2c954ebf62 100644
--- a/test/language/arguments-object/10.6-13-1.js
+++ b/test/language/arguments-object/10.6-13-1.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-13-1
 description: Accessing caller property of Arguments object is allowed
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-13-a-1.js b/test/language/arguments-object/10.6-13-a-1.js
index 9bedd01ed6..b0009fe7c5 100644
--- a/test/language/arguments-object/10.6-13-a-1.js
+++ b/test/language/arguments-object/10.6-13-a-1.js
@@ -9,6 +9,7 @@ es5id: 10.6-13-a-1
 description: >
     In non-strict mode, arguments object should have its own 'callee'
     property defined (Step 13.a)
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-13-a-2.js b/test/language/arguments-object/10.6-13-a-2.js
index 3cdce0d6f6..3dc027cb72 100644
--- a/test/language/arguments-object/10.6-13-a-2.js
+++ b/test/language/arguments-object/10.6-13-a-2.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-13-a-2
 description: A direct call to arguments.callee.caller should work
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-13-a-3.js b/test/language/arguments-object/10.6-13-a-3.js
index 86454f9ce7..c0f2854836 100644
--- a/test/language/arguments-object/10.6-13-a-3.js
+++ b/test/language/arguments-object/10.6-13-a-3.js
@@ -7,6 +7,7 @@
 /*---
 es5id: 10.6-13-a-3
 description: An indirect call to arguments.callee.caller should work
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-6-3-s.js b/test/language/arguments-object/10.6-6-3-s.js
new file mode 100644
index 0000000000..40a7e6fb6b
--- /dev/null
+++ b/test/language/arguments-object/10.6-6-3-s.js
@@ -0,0 +1,20 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+es5id: 10.6-6-3
+description: >
+    'length' property of arguments object for 0 argument function
+    exists
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+	return (function () {return arguments.length !== undefined})();
+ }
+runTestCase(testcase);
diff --git a/test/language/arguments-object/10.6-6-3.js b/test/language/arguments-object/10.6-6-3.js
index bd461a05a1..d32d0dc64f 100644
--- a/test/language/arguments-object/10.6-6-3.js
+++ b/test/language/arguments-object/10.6-6-3.js
@@ -9,6 +9,7 @@ es5id: 10.6-6-3
 description: >
     'length' property of arguments object for 0 argument function
     exists
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/arguments-object/10.6-6-4-s.js b/test/language/arguments-object/10.6-6-4-s.js
new file mode 100644
index 0000000000..ccf3d9c5ba
--- /dev/null
+++ b/test/language/arguments-object/10.6-6-4-s.js
@@ -0,0 +1,20 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+es5id: 10.6-6-4
+description: >
+    'length' property of arguments object for 0 argument function call
+    is 0 even with formal parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+	return (function (a,b,c) {return arguments.length === 0})();
+ }
+runTestCase(testcase);
diff --git a/test/language/arguments-object/10.6-6-4.js b/test/language/arguments-object/10.6-6-4.js
index 1ece6916ad..c331ba3ea2 100644
--- a/test/language/arguments-object/10.6-6-4.js
+++ b/test/language/arguments-object/10.6-6-4.js
@@ -9,6 +9,7 @@ es5id: 10.6-6-4
 description: >
     'length' property of arguments object for 0 argument function call
     is 0 even with formal parameters
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/eval-code/10.4.2-1-1.js b/test/language/eval-code/10.4.2-1-1.js
index 59c66786f9..5e586dd1f8 100644
--- a/test/language/eval-code/10.4.2-1-1.js
+++ b/test/language/eval-code/10.4.2-1-1.js
@@ -12,8 +12,6 @@ includes: [runTestCase.js]
 
 var __10_4_2_1_1_1 = "str";
 function testcase() {
-  try {
-
     var _eval = eval;
     var __10_4_2_1_1_1 = "str1";
     if(_eval("\'str\' === __10_4_2_1_1_1") === true &&  // indirect eval
@@ -21,8 +19,5 @@ function testcase() {
        return true;
     }
     return false;
-  } finally {
-    delete this.__10_4_2_1_1_1;
-  }
 }
 runTestCase(testcase);
diff --git a/test/language/eval-code/10.4.2-1-2.js b/test/language/eval-code/10.4.2-1-2.js
index 71b048d0e0..1bf085e9ae 100644
--- a/test/language/eval-code/10.4.2-1-2.js
+++ b/test/language/eval-code/10.4.2-1-2.js
@@ -14,8 +14,6 @@ includes: [runTestCase.js]
 
 var __10_4_2_1_2 = "str";
 function testcase() {
-        try {
-
             var _eval = eval;
             var __10_4_2_1_2 = "str1";
             function foo() {
@@ -28,8 +26,5 @@ function testcase() {
                 }
             }
             return foo();
-        } finally {
-            delete this.__10_4_2_1_1_2;
-        }
     }
 runTestCase(testcase);
diff --git a/test/language/eval-code/10.4.2-1-3.js b/test/language/eval-code/10.4.2-1-3.js
index 327903e598..0888aa561a 100644
--- a/test/language/eval-code/10.4.2-1-3.js
+++ b/test/language/eval-code/10.4.2-1-3.js
@@ -14,9 +14,6 @@ includes: [runTestCase.js]
 
 var __10_4_2_1_3 = "str";
 function testcase() {
-
-        try {
-
             var _eval = eval;
             var __10_4_2_1_3 = "str1";
             try {
@@ -31,8 +28,5 @@ function testcase() {
                     return false;
                 }
             }
-        } finally {
-            delete this.__10_4_2_1_3;
-        }
     }
 runTestCase(testcase);
diff --git a/test/language/eval-code/10.4.2-1-4.js b/test/language/eval-code/10.4.2-1-4.js
index af518a34d1..71d88aca1d 100644
--- a/test/language/eval-code/10.4.2-1-4.js
+++ b/test/language/eval-code/10.4.2-1-4.js
@@ -9,12 +9,12 @@ es5id: 10.4.2-1-4
 description: >
     Indirect call to eval has context set to global context (with
     block)
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
 var __10_4_2_1_4 = "str";
 function testcase() {
-        try {
             var o = new Object();
             o.__10_4_2_1_4 = "str2";
             var _eval = eval;
@@ -26,8 +26,5 @@ function testcase() {
                 }
             }
             return false;
-        } finally {
-            delete this.__10_4_2_1_4;
-        }
     }
 runTestCase(testcase);
diff --git a/test/language/eval-code/10.4.2-1-5.js b/test/language/eval-code/10.4.2-1-5.js
index 6a7cb55875..62acb2c978 100644
--- a/test/language/eval-code/10.4.2-1-5.js
+++ b/test/language/eval-code/10.4.2-1-5.js
@@ -14,8 +14,6 @@ includes: [runTestCase.js]
 
 var __10_4_2_1_5 = "str";
 function testcase() {
-        try {
-
             var __10_4_2_1_5 = "str1";
             var r = eval("\
                           var _eval = eval; \
@@ -24,8 +22,5 @@ function testcase() {
                           eval(\"\'str2\' === __10_4_2_1_5\")\
                         ");
             return r;
-        } finally {
-            delete this.__10_4_2_1_5;
-        }
     }
 runTestCase(testcase);
diff --git a/test/language/eval-code/10.4.2-2-c-1.js b/test/language/eval-code/10.4.2-2-c-1.js
index 4747e1ba68..dda002b1ac 100644
--- a/test/language/eval-code/10.4.2-2-c-1.js
+++ b/test/language/eval-code/10.4.2-2-c-1.js
@@ -9,6 +9,7 @@ es5id: 10.4.2-2-c-1
 description: >
     Direct val code in non-strict mode - can instantiate variable in
     calling context
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/eval-code/S10.4.2_A1.1_T1.js b/test/language/eval-code/S10.4.2_A1.1_T1.js
index 1e085af9d5..aefa1d3234 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T1.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T1.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T1
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T10.js b/test/language/eval-code/S10.4.2_A1.1_T10.js
index fe2d03eacb..38ac16ebef 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T10.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T10.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T10
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T11.js b/test/language/eval-code/S10.4.2_A1.1_T11.js
index f140700938..b0e4a48a63 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T11.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T11.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T11
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T12.js b/test/language/eval-code/S10.4.2_A1.1_T12.js
new file mode 100755
index 0000000000..75cce6ddba
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T12.js
@@ -0,0 +1,28 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T12
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
+
+var x = 1;
+var y = 2;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T13.js b/test/language/eval-code/S10.4.2_A1.1_T13.js
new file mode 100755
index 0000000000..39087b0d49
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T13.js
@@ -0,0 +1,27 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T13
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+this.x = 1;
+this.y = 2;
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
diff --git a/test/language/eval-code/S10.4.2_A1.1_T14.js b/test/language/eval-code/S10.4.2_A1.1_T14.js
new file mode 100755
index 0000000000..73e684903f
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T14.js
@@ -0,0 +1,28 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T14
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+var x = 1;
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
+
+var y = 2;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T15.js b/test/language/eval-code/S10.4.2_A1.1_T15.js
new file mode 100755
index 0000000000..769609c12f
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T15.js
@@ -0,0 +1,28 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T15
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+this.x = 1;
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
+
+this.y = 2;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T16.js b/test/language/eval-code/S10.4.2_A1.1_T16.js
new file mode 100755
index 0000000000..67756ce517
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T16.js
@@ -0,0 +1,28 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T16
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+var x = 1;
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
+
+this.y = 2;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T17.js b/test/language/eval-code/S10.4.2_A1.1_T17.js
new file mode 100755
index 0000000000..560df8fd4b
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T17.js
@@ -0,0 +1,28 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T17
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+this.x = 1;
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
+
+var y = 2;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T18.js b/test/language/eval-code/S10.4.2_A1.1_T18.js
new file mode 100755
index 0000000000..49714ee876
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T18.js
@@ -0,0 +1,27 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T18
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+var x = 1;
+var y = 2;
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
diff --git a/test/language/eval-code/S10.4.2_A1.1_T19.js b/test/language/eval-code/S10.4.2_A1.1_T19.js
new file mode 100755
index 0000000000..6aeecf3690
--- /dev/null
+++ b/test/language/eval-code/S10.4.2_A1.1_T19.js
@@ -0,0 +1,28 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+es5id: 10.4.2_A1.1_T19
+description: eval within global execution context
+---*/
+
+var i;
+var j;
+var str1 = '';
+var str2 = '';
+
+for(i in this){
+  str1+=i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if(!(str1 === str2)){
+  $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
+}
+
+this.x = 1;
+this.y = 2;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T2.js b/test/language/eval-code/S10.4.2_A1.1_T2.js
index 811ebfa607..e61dd550f5 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T2.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T2.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T2
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T3.js b/test/language/eval-code/S10.4.2_A1.1_T3.js
index 6b5572d040..ff24c0e1e3 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T3.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T3.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T3
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T4.js b/test/language/eval-code/S10.4.2_A1.1_T4.js
index 0226e73daf..49f3d1ba2d 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T4.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T4.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T4
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T5.js b/test/language/eval-code/S10.4.2_A1.1_T5.js
index 56479a22c9..72ae090cd9 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T5.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T5.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T5
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T6.js b/test/language/eval-code/S10.4.2_A1.1_T6.js
index 0b8cfd0459..b83bf3bce0 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T6.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T6.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T6
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T7.js b/test/language/eval-code/S10.4.2_A1.1_T7.js
index c0aa554012..5823aed4c2 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T7.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T7.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T7
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T8.js b/test/language/eval-code/S10.4.2_A1.1_T8.js
index a6e452c705..0aaf82dfb9 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T8.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T8.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T8
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.1_T9.js b/test/language/eval-code/S10.4.2_A1.1_T9.js
index 83bd435e0f..d24d7714e0 100644
--- a/test/language/eval-code/S10.4.2_A1.1_T9.js
+++ b/test/language/eval-code/S10.4.2_A1.1_T9.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.1_T9
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 var i;
diff --git a/test/language/eval-code/S10.4.2_A1.2_T1.js b/test/language/eval-code/S10.4.2_A1.2_T1.js
index d670a5fac6..76af3f020e 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T1.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T1.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T1
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T10.js b/test/language/eval-code/S10.4.2_A1.2_T10.js
index 2a1caa67ad..b1a6c7abcc 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T10.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T10.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T10
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T2.js b/test/language/eval-code/S10.4.2_A1.2_T2.js
index 070b1822e7..94fca7227c 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T2.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T2.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T2
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T3.js b/test/language/eval-code/S10.4.2_A1.2_T3.js
index 1d685682d4..832f2142d8 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T3.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T3.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T3
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T4.js b/test/language/eval-code/S10.4.2_A1.2_T4.js
index 9bd33e38be..aad343be11 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T4.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T4.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T4
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T5.js b/test/language/eval-code/S10.4.2_A1.2_T5.js
index ad9759a297..9a8668b282 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T5.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T5.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T5
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T6.js b/test/language/eval-code/S10.4.2_A1.2_T6.js
index 03ecd0ff31..c5783b561c 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T6.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T6.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T6
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T7.js b/test/language/eval-code/S10.4.2_A1.2_T7.js
index dd3f344ec9..1863da61b6 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T7.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T7.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T7
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T8.js b/test/language/eval-code/S10.4.2_A1.2_T8.js
index 9802136542..e8d356c1fe 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T8.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T8.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T8
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/eval-code/S10.4.2_A1.2_T9.js b/test/language/eval-code/S10.4.2_A1.2_T9.js
index 56018e52b6..90d6649d3f 100644
--- a/test/language/eval-code/S10.4.2_A1.2_T9.js
+++ b/test/language/eval-code/S10.4.2_A1.2_T9.js
@@ -7,6 +7,7 @@ info: >
     in the same order, as the calling context's scope chain
 es5id: 10.4.2_A1.2_T9
 description: eval within global execution context
+flags: [noStrict]
 ---*/
 
 function f(){
diff --git a/test/language/expressions/typeof/syntax.js b/test/language/expressions/typeof/syntax.js
index 7759998971..9d9b87dea6 100644
--- a/test/language/expressions/typeof/syntax.js
+++ b/test/language/expressions/typeof/syntax.js
@@ -13,61 +13,61 @@ description: Checking by using eval
 assert.sameValue(
   eval("var x = 0; typeof\u0009x"),
   "number",
-  '#1: var x = 0; typeof\\u0009x; x === "number". Actual: ' + (x)
+  '#1: var x = 0; typeof\\u0009x; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u000Bx"),
   "number",
-  '#2: var x = 0; typeof\\u000Bx; x === "number". Actual: ' + (x)
+  '#2: var x = 0; typeof\\u000Bx; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u000Cx"),
   "number",
-  '#3: var x = 0; typeof\\u000Cx; x === "number". Actual: ' + (x)
+  '#3: var x = 0; typeof\\u000Cx; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u0020x"),
   "number",
-  '#4: var x = 0; typeof\\u0020x; x === "number". Actual: ' + (x)
+  '#4: var x = 0; typeof\\u0020x; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u00A0x"),
   "number",
-  '#5: var x = 0; typeof\\u00A0x; x === "number". Actual: ' + (x)
+  '#5: var x = 0; typeof\\u00A0x; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u000Ax"),
   "number",
-  '#6: var x = 0; typeof\\u000Ax; x === "number". Actual: ' + (x)
+  '#6: var x = 0; typeof\\u000Ax; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u000Dx"),
   "number",
-  '#7: var x = 0; typeof\\u000Dx; x === "number". Actual: ' + (x)
+  '#7: var x = 0; typeof\\u000Dx; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u2028x"),
   "number",
-  '#8: var x = 0; typeof\\u2028x; x === "number". Actual: ' + (x)
+  '#8: var x = 0; typeof\\u2028x; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u2029x"),
   "number",
-  '#9: var x = 0; typeof\\u2029x; x === "number". Actual: ' + (x)
+  '#9: var x = 0; typeof\\u2029x; x === "number".'
 );
 
 assert.sameValue(
   eval("var x = 0; typeof\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029x"),
   "number",
-  '#10: var x = 0; typeof\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029x; x === "number". Actual: ' + (x)
+  '#10: var x = 0; typeof\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029x; x === "number".'
 );
 
 assert.sameValue(
diff --git a/test/language/expressions/yield/from-with.js b/test/language/expressions/yield/from-with.js
index e3f53312a8..b9ce872356 100644
--- a/test/language/expressions/yield/from-with.js
+++ b/test/language/expressions/yield/from-with.js
@@ -5,6 +5,7 @@ es6id: 25.2
 description: >
     The operand to a `yield` expression should honor the semantics of the
     `with` statement.
+flags: [noStrict]
 ---*/
 
 function* g() {
diff --git a/test/language/function-code/10.4.3-1-105.js b/test/language/function-code/10.4.3-1-105.js
index 5d5479d0b4..34ce38e5ea 100644
--- a/test/language/function-code/10.4.3-1-105.js
+++ b/test/language/function-code/10.4.3-1-105.js
@@ -12,6 +12,7 @@ es5id: 10.4.3-1-105
 description: >
     Non strict mode should ToObject thisArg if not an object.  Return
     type should be object and strict equality should fail.
+flags: [noStrict]
 includes: [runTestCase.js]
 ---*/
 
diff --git a/test/language/function-code/S10.2.1_A3.js b/test/language/function-code/S10.2.1_A3.js
index 0ff9385ff8..c24fa60962 100644
--- a/test/language/function-code/S10.2.1_A3.js
+++ b/test/language/function-code/S10.2.1_A3.js
@@ -11,6 +11,7 @@ description: >
     Creating functions with two or more formal parameters,  that have
     the same name. Calling this function excluding a few last
     parameters
+flags: [noStrict]
 ---*/
 
 //CHECK#1
diff --git a/test/language/punctuators/S7.7_A1.js b/test/language/punctuators/S7.7_A1.js
index a198567790..dfc6a184d3 100644
--- a/test/language/punctuators/S7.7_A1.js
+++ b/test/language/punctuators/S7.7_A1.js
@@ -7,14 +7,16 @@ es5id: 7.7_A1
 description: Using all punctuators
 ---*/
 
+this.nan = NaN;
+
 //CHECK#1
   ({});[];
-  this.NaN; 
+  this.nan;
   1 < 2 > 3 <= 4 >= 5 == 6 != 7 === 8 !== 9;
   1 + 2 - 3 * 4 % 5 / 6 << 7 >> 8 >>> 9;
-  this.NaN++; ++this.NaN; this.NaN--; --this.NaN;
+  this.nan++; ++this.nan; this.nan--; --this.nan;
   1 & 2 | 3 ^ 4 && !5 || ~6;
   1 ? 2 : 3;
-  this.NaN = 1; this.NaN += 2; this.NaN -= 3; this.NaN *= 4; this.NaN /= 5;
-  this.NaN %= 6; this.NaN <<= 7; this.NaN >>= 8; this.NaN >>>= 9;
-  this.NaN &= 1; this.NaN |= 2; this.NaN ^= 3;
+  this.nan = 1; this.nan += 2; this.nan -= 3; this.nan *= 4; this.nan /= 5;
+  this.nan %= 6; this.nan <<= 7; this.nan >>= 8; this.nan >>>= 9;
+  this.nan &= 1; this.nan |= 2; this.nan ^= 3;
diff --git a/test/language/statements/for-of/iterator-next-result-type.js b/test/language/statements/for-of/iterator-next-result-type.js
index 7deab2e5cf..6ef932c83f 100644
--- a/test/language/statements/for-of/iterator-next-result-type.js
+++ b/test/language/statements/for-of/iterator-next-result-type.js
@@ -97,7 +97,7 @@ firstIterResult = new Proxy({}, {
     $ERROR('This code is unreachable.');
   }
 });
-i = 0;
+var i = 0;
 for (var x of iterable) {
   assert.sameValue(x, 23);
   i++;
diff --git a/test/language/types/number/S8.5_A10_T1.js b/test/language/types/number/S8.5_A10_T1.js
new file mode 100644
index 0000000000..f7c2c5cdb0
--- /dev/null
+++ b/test/language/types/number/S8.5_A10_T1.js
@@ -0,0 +1,10 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: Infinity is not a keyword
+es5id: 8.5_A10
+description: Create variable entitled Infinity
+---*/
+
+var Infinity;
diff --git a/test/language/types/number/S8.5_A10.js b/test/language/types/number/S8.5_A10_T2.js
similarity index 94%
rename from test/language/types/number/S8.5_A10.js
rename to test/language/types/number/S8.5_A10_T2.js
index 78e2bacd2b..6ec85c1a03 100644
--- a/test/language/types/number/S8.5_A10.js
+++ b/test/language/types/number/S8.5_A10_T2.js
@@ -5,6 +5,7 @@
 info: Infinity is not a keyword
 es5id: 8.5_A10
 description: Create variable entitled Infinity
+flags: [noStrict]
 ---*/
 
 var Infinity=1.0;
diff --git a/test/language/types/number/S8.5_A4_T1.js b/test/language/types/number/S8.5_A4_T1.js
new file mode 100644
index 0000000000..e82140a771
--- /dev/null
+++ b/test/language/types/number/S8.5_A4_T1.js
@@ -0,0 +1,10 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: NaN is not a keyword
+es5id: 8.5_A4
+description: Create variable entitled NaN
+---*/
+
+var NaN;
diff --git a/test/language/types/number/S8.5_A4.js b/test/language/types/number/S8.5_A4_T2.js
similarity index 93%
rename from test/language/types/number/S8.5_A4.js
rename to test/language/types/number/S8.5_A4_T2.js
index 2f580f67b3..c145213d4d 100644
--- a/test/language/types/number/S8.5_A4.js
+++ b/test/language/types/number/S8.5_A4_T2.js
@@ -5,6 +5,7 @@
 info: NaN is not a keyword
 es5id: 8.5_A4
 description: Create variable entitled NaN
+flags: [noStrict]
 ---*/
 
 var NaN=1.0;
diff --git a/test/language/types/undefined/S8.1_A3_T1.js b/test/language/types/undefined/S8.1_A3_T1.js
new file mode 100644
index 0000000000..8d7af07a0a
--- /dev/null
+++ b/test/language/types/undefined/S8.1_A3_T1.js
@@ -0,0 +1,14 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: undefined is not a keyword
+es5id: 8.1_A3
+description: Create variable named undefined
+---*/
+
+//////////////////////////////////////////////////////////
+// CHECK1#
+var undefined;
+//
+//////////////////////////////////////////////////////////
diff --git a/test/language/types/undefined/S8.1_A3.js b/test/language/types/undefined/S8.1_A3_T2.js
similarity index 95%
rename from test/language/types/undefined/S8.1_A3.js
rename to test/language/types/undefined/S8.1_A3_T2.js
index 60d0e3a578..64b12d99e9 100644
--- a/test/language/types/undefined/S8.1_A3.js
+++ b/test/language/types/undefined/S8.1_A3_T2.js
@@ -5,6 +5,7 @@
 info: undefined is not a keyword
 es5id: 8.1_A3
 description: Create variable named undefined
+flags: [noStrict]
 ---*/
 
 //////////////////////////////////////////////////////////