diff --git a/src/class-fields/initializer-eval-super/cls-decl-fields-eval.template b/src/class-fields/initializer-eval-super/cls-decl-fields-eval.template
index 101cf30b3849b1351ef0f0bc7a7a68264fabbe21..5870c9a69a2e17fc30a0ab41520d453ce28e1a02 100644
--- a/src/class-fields/initializer-eval-super/cls-decl-fields-eval.template
+++ b/src/class-fields/initializer-eval-super/cls-decl-fields-eval.template
@@ -11,7 +11,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = eval('executed = true; /*{ initializer }*/;';
+  x = eval('executed = true; /*{ initializer }*/;');
 }
 
 assert.throws(/*{ earlyerror }*/, function() {
diff --git a/src/class-fields/initializer-eval-super/cls-decl-fields-indirect-eval.template b/src/class-fields/initializer-eval-super/cls-decl-fields-indirect-eval.template
index 9d77186bf2be562b9df21a7e227321be4c168228..9dafcc047722967bf39f0111cf4e8caca6d05a22 100644
--- a/src/class-fields/initializer-eval-super/cls-decl-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval-super/cls-decl-fields-indirect-eval.template
@@ -11,7 +11,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = (0, eval)('executed = true; /*{ initializer }*/;';
+  x = (0, eval)('executed = true; /*{ initializer }*/;');
 }
 
 assert.throws(/*{ executionerror }*/, function() {
diff --git a/src/class-fields/initializer-eval-super/cls-expr-fields-eval.template b/src/class-fields/initializer-eval-super/cls-expr-fields-eval.template
index 39597e8807faec82718408a6f01494e9f58ed20c..d4517cd6182c8701d261d48be212da5c3884aec3 100644
--- a/src/class-fields/initializer-eval-super/cls-expr-fields-eval.template
+++ b/src/class-fields/initializer-eval-super/cls-expr-fields-eval.template
@@ -7,11 +7,11 @@ path: language/expressions/class/fields-derived-cls-direct-
 name: direct eval
 ---*/
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = eval('executed = true; /*{ initializer }*/;';
+var C = class extends A {
+  x = eval('executed = true; /*{ initializer }*/;');
 }
 
 assert.throws(/*{ earlyerror }*/, function() {
diff --git a/src/class-fields/initializer-eval-super/cls-expr-fields-indirect-eval.template b/src/class-fields/initializer-eval-super/cls-expr-fields-indirect-eval.template
index 86db54edbc1f702f534273b46e242516e2208bdb..f024c4f07b17851a23f5ebbaf0e3f993399cc9bb 100644
--- a/src/class-fields/initializer-eval-super/cls-expr-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval-super/cls-expr-fields-indirect-eval.template
@@ -7,11 +7,11 @@ path: language/expressions/class/fields-derived-cls-indirect-
 name: indirect eval
 ---*/
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = (0, eval)('executed = true; /*{ initializer }*/;';
+var C = class extends A {
+  x = (0, eval)('executed = true; /*{ initializer }*/;');
 }
 
 assert.throws(/*{ executionerror }*/, function() {
diff --git a/src/class-fields/initializer-eval/cls-expr-fields-eval.template b/src/class-fields/initializer-eval/cls-expr-fields-eval.template
index 9915d0d098d6429d750b86551333c1ac5d634cec..a8acc6317bc13f64058e788633db3c14b20b67eb 100644
--- a/src/class-fields/initializer-eval/cls-expr-fields-eval.template
+++ b/src/class-fields/initializer-eval/cls-expr-fields-eval.template
@@ -8,7 +8,7 @@ name: direct eval
 ---*/
 
 var executed = false;
-C = class {
+var C = class {
   x = eval('executed = true; /*{ initializer }*/;');
 }
 
diff --git a/src/class-fields/initializer-eval/cls-expr-fields-indirect-eval.template b/src/class-fields/initializer-eval/cls-expr-fields-indirect-eval.template
index d04a83dfb912085887f5fc176f9588773b7a6bc7..8a37149a3368b38aaf13defe8a1b7bf292a2a4b8 100644
--- a/src/class-fields/initializer-eval/cls-expr-fields-indirect-eval.template
+++ b/src/class-fields/initializer-eval/cls-expr-fields-indirect-eval.template
@@ -8,7 +8,7 @@ name: indirect eval
 ---*/
 
 var executed = false;
-C = class {
+var C = class {
   x = (0, eval)('executed = true; /*{ initializer }*/;');
 }
 
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
index 2ac84d65d2cb55dce2c80e3555e44b6442bd523c..af1ce24fa070e33e876682c00665b23c0466a58d 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = eval('executed = true; super();';
+var C = class extends A {
+  x = eval('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
index ba1add291b15eeb41f084aa4d9b399c32b76c8e4..0a5ef69f3facbd25dbd9cc24ddff446c1ebc26f7 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = eval('executed = true; super().x;';
+var C = class extends A {
+  x = eval('executed = true; super().x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js
index 4b756296a93f81829aa9cfdcf7c442e03ec5138a..726b8a22f965abe962247717422dee7275394cbc 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-supercall.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = eval('executed = true; super();';
+var C = class extends A {
+  x = eval('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
index 123a7ecf7bccca95fedd473a09439c104022e278..6cb4e6d76cdaa66e7c16c7a606baffa242b70d10 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = eval('executed = true; super.x;';
+var C = class extends A {
+  x = eval('executed = true; super.x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
index 7292046b2423f7b0b2b5a331ef5611392b8fbe8d..4991e904b2db5d2155e7ea744fdffc3535fb98c3 100644
--- a/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
+++ b/test/language/expressions/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = eval('executed = true; super["x"];';
+var C = class extends A {
+  x = eval('executed = true; super["x"];');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
index 32f01513291ad145a8f434a589a9b1ca265d9636..8bbacef5b6fb128d782c9ac5b90489d018ec0764 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = (0, eval)('executed = true; super();';
+var C = class extends A {
+  x = (0, eval)('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
index 26e1d67029d21cd9af59f01eb6d467590918f882..65b5a2166d9af07d4c3faa480e37133e3bf4a318 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = (0, eval)('executed = true; super().x;';
+var C = class extends A {
+  x = (0, eval)('executed = true; super().x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
index b7f6593de58800b35e36624fd0c219b001e66e6f..86fa84d9c0d1c521c99a2de0d99f7a4638a16644 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = (0, eval)('executed = true; super();';
+var C = class extends A {
+  x = (0, eval)('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
index 86e433818e0a85cc1f9c5d53f9802bafaa16dc4b..e383332905224be03bc06894359a9bce6735391c 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = (0, eval)('executed = true; super.x;';
+var C = class extends A {
+  x = (0, eval)('executed = true; super.x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
index 51c2fdec2a6055d080895a7085e2fb6d666d8c83..d276eb785ee2d1a180eeb8eee1b760b37d168331 100644
--- a/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
+++ b/test/language/expressions/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
@@ -23,11 +23,11 @@ info: |
 ---*/
 
 
-A = class {}
+var A = class {}
 
 var executed = false;
-C = class extends A {
-  x = (0, eval)('executed = true; super["x"];';
+var C = class extends A {
+  x = (0, eval)('executed = true; super["x"];');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js b/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js
index 605db5f1415e7b0736d71962bab3a0d25abb64a8..90cf038bc18d2781cd7121bbc239900fd8a61830 100644
--- a/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-direct-eval-err-contains-arguments.js
@@ -25,7 +25,7 @@ info: |
 
 
 var executed = false;
-C = class {
+var C = class {
   x = eval('executed = true; arguments;');
 }
 
diff --git a/test/language/expressions/class/fields-direct-eval-err-contains-newcall.js b/test/language/expressions/class/fields-direct-eval-err-contains-newcall.js
index 95409dabd895efdace7c21a3b403bfe60dfbfadc..78ba05a84f011d1c2a64990ee00c086baf7647d0 100644
--- a/test/language/expressions/class/fields-direct-eval-err-contains-newcall.js
+++ b/test/language/expressions/class/fields-direct-eval-err-contains-newcall.js
@@ -24,7 +24,7 @@ info: |
 
 
 var executed = false;
-C = class {
+var C = class {
   x = eval('executed = true; new.call;');
 }
 
diff --git a/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js b/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js
index 6840d4d44556890c9f8c20f8e10ca1d9d6991eea..af0b879bc52dd31bf14f3e86f5244c82a4ca6338 100644
--- a/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js
+++ b/test/language/expressions/class/fields-indirect-eval-err-contains-arguments.js
@@ -25,7 +25,7 @@ info: |
 
 
 var executed = false;
-C = class {
+var C = class {
   x = (0, eval)('executed = true; arguments;');
 }
 
diff --git a/test/language/expressions/class/fields-indirect-eval-err-contains-newcall.js b/test/language/expressions/class/fields-indirect-eval-err-contains-newcall.js
index 6ed17f4b56af6ce331bd13321bd7a9891f1d3ffa..b61f06c89766554235483f9af96279f561814034 100644
--- a/test/language/expressions/class/fields-indirect-eval-err-contains-newcall.js
+++ b/test/language/expressions/class/fields-indirect-eval-err-contains-newcall.js
@@ -24,7 +24,7 @@ info: |
 
 
 var executed = false;
-C = class {
+var C = class {
   x = (0, eval)('executed = true; new.call;');
 }
 
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
index b31233318e4c165fc7db671e19e2b82614d73985..c131866617f06929eafb34be7abf232f5c1a7774 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-1.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = eval('executed = true; super();';
+  x = eval('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
index b969e3860aef3dfd70e0a6930f12653fe76fb09a..a5b22b1fe47d02019c9a92a668e30ec6312341b5 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall-2.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = eval('executed = true; super().x;';
+  x = eval('executed = true; super().x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js
index bfd7dce289e017fb611a656460ef17ab391e6de0..d7b840a3f9cda852cc235b5b6f3987e418bc340a 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-supercall.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = eval('executed = true; super();';
+  x = eval('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
index d9b803b3e14e93315a8455de2a8dc39bc5a87244..1332accb95dc85da9329b0039fb8c8eb208e3547 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-1.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = eval('executed = true; super.x;';
+  x = eval('executed = true; super.x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
index bd0e0509bf4cde5192dd74e52298d42eea615907..5771df04eaec9102a3df6cbe10f50a3b2d8a1d57 100644
--- a/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
+++ b/test/language/statements/class/fields-derived-cls-direct-eval-err-contains-superproperty-2.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = eval('executed = true; super["x"];';
+  x = eval('executed = true; super["x"];');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
index 27887d1f03d48f35231d97823cc66086961deea8..12aade8fb469146802d2e4b5c054fb11b7f633e9 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-1.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = (0, eval)('executed = true; super();';
+  x = (0, eval)('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
index 8e6957dc212f00f92f0c962623104298fc405ef8..e3925d4419ae06e7e4d27b491a40fae6c0b2b5f8 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall-2.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = (0, eval)('executed = true; super().x;';
+  x = (0, eval)('executed = true; super().x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
index 047c0b95c77f0cb48f8551c3e9347930bba9ee4f..86851ea77cf66cef68b9a4248b09f23bf8db3df9 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-supercall.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = (0, eval)('executed = true; super();';
+  x = (0, eval)('executed = true; super();');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
index b701e5f70b360fb9ef7e5c638c3f24b019e8c211..7b4b88dd69d60429a836fae933a686283a2127d2 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-1.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = (0, eval)('executed = true; super.x;';
+  x = (0, eval)('executed = true; super.x;');
 }
 
 assert.throws(SyntaxError, function() {
diff --git a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
index 5d35bff3ed74c0298a496a6a9afe9c6689b99a5e..e1faa71978a592cbacf1bf355430bd9b6f429601 100644
--- a/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
+++ b/test/language/statements/class/fields-derived-cls-indirect-eval-err-contains-superproperty-2.js
@@ -27,7 +27,7 @@ class A = {}
 
 var executed = false;
 class C extends A = {
-  x = (0, eval)('executed = true; super["x"];';
+  x = (0, eval)('executed = true; super["x"];');
 }
 
 assert.throws(SyntaxError, function() {