diff --git a/src/class-elements/grammar-special-meth-ctor-set.case b/src/class-elements/grammar-special-meth-ctor-set.case
index d7855ad3cea86792199f346a3b2be021bc6a5712..b65654212ba87743671422181b8366c3ec8d533b 100644
--- a/src/class-elements/grammar-special-meth-ctor-set.case
+++ b/src/class-elements/grammar-special-meth-ctor-set.case
@@ -12,4 +12,4 @@ template: syntax/invalid
 ---*/
 
 //- elements
-set constructor() {}
+set constructor(_) {}
diff --git a/src/class-elements/grammar-static-ctor-accessor-meth-valid.case b/src/class-elements/grammar-static-ctor-accessor-meth-valid.case
index d161900eb12bf7fc1aa3a9166c40ca07934e49bc..4e0cba9bc772e2961d53359f89087066f71553c4 100644
--- a/src/class-elements/grammar-static-ctor-accessor-meth-valid.case
+++ b/src/class-elements/grammar-static-ctor-accessor-meth-valid.case
@@ -17,7 +17,7 @@ template: syntax/valid
 
 //- elements
 static get constructor() {}
-static set constructor() {}
+static set constructor(_) {}
 constructor() {} // stacks with a valid constructor
 //- teardown
 assert(C.hasOwnProperty('constructor'));
diff --git a/src/class-elements/grammar-static-private-ctor-meth-valid.case b/src/class-elements/grammar-static-private-ctor-meth-valid.case
deleted file mode 100644
index f4db2766d0cc68fab90501fb857e31c93ea46825..0000000000000000000000000000000000000000
--- a/src/class-elements/grammar-static-private-ctor-meth-valid.case
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2018 Leo Balter. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-desc: Static Methods can be named constructor
-info: |
-    Class Definitions / Static Semantics: Early Errors
-
-    ClassElement : static MethodDefinition
-        It is a Syntax Error if PropName of MethodDefinition is "prototype"
-template: syntax/invalid
----*/
-
-//- elements
-static constructor() {}
-constructor() {} // stacks with a valid constructor
diff --git a/src/class-elements/grammar-static-set-meth-prototype.case b/src/class-elements/grammar-static-set-meth-prototype.case
index 6c814a11423543fcd04a312923e32743f0e7abbb..6403e4f0e41b0b26d1528f81bc8eff42494b13d4 100644
--- a/src/class-elements/grammar-static-set-meth-prototype.case
+++ b/src/class-elements/grammar-static-set-meth-prototype.case
@@ -12,4 +12,4 @@ template: syntax/invalid
 ---*/
 
 //- elements
-static set prototype() {}
+static set prototype(_) {}
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js
index d024b1729ab2154a861976b1bb9381782188002d..c00b6ebee7e26d306bd32ada6a791eab32da1c9d 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js
@@ -21,5 +21,5 @@ info: |
 throw "Test262: This statement should not be evaluated.";
 
 var C = class {
-  set constructor() {}
+  set constructor(_) {}
 };
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js
deleted file mode 100644
index 1b5f2e7eab998ed81a7f77a20c556a1c7cd64491..0000000000000000000000000000000000000000
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/class-elements/grammar-static-private-ctor-meth-valid.case
-// - src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
-/*---
-description: Static Methods can be named constructor (class expression)
-esid: prod-ClassElement
-features: [class]
-flags: [generated]
-negative:
-  phase: parse
-  type: SyntaxError
-info: |
-    Class Definitions / Static Semantics: Early Errors
-
-    ClassElement : static MethodDefinition
-        It is a Syntax Error if PropName of MethodDefinition is "prototype"
-
----*/
-
-
-throw "Test262: This statement should not be evaluated.";
-
-var C = class {
-  static constructor() {}
-  constructor() {} // stacks with a valid constructor
-};
diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js
index 0e675f4a87b64926d76449625946fdf13f26ab37..a49baf5f2cb18c147633dd66053460208fbb47fe 100644
--- a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js
+++ b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js
@@ -21,5 +21,5 @@ info: |
 throw "Test262: This statement should not be evaluated.";
 
 var C = class {
-  static set prototype() {}
+  static set prototype(_) {}
 };
diff --git a/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js b/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js
index 86f0bb41fecf5df43342dd6b84f4e566a9a71a45..87f7659badff16ee9bcc5a1af8d1912890b94859 100644
--- a/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js
+++ b/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js
@@ -21,7 +21,7 @@ info: |
 
 var C = class {
   static get constructor() {}
-  static set constructor() {}
+  static set constructor(_) {}
   constructor() {} // stacks with a valid constructor
 };
 
diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js
index 8e6097701becc1800353ca1d1d0dc7825445aec7..7567981c19f42bc804a514e19acd6046504e9d9e 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js
@@ -21,5 +21,5 @@ info: |
 throw "Test262: This statement should not be evaluated.";
 
 class C {
-  set constructor() {}
+  set constructor(_) {}
 }
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js
deleted file mode 100644
index 2ec596b36408a98f6a8770ddada9ffb997329eba..0000000000000000000000000000000000000000
--- a/test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// This file was procedurally generated from the following sources:
-// - src/class-elements/grammar-static-private-ctor-meth-valid.case
-// - src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
-/*---
-description: Static Methods can be named constructor (class declaration)
-esid: prod-ClassElement
-features: [class]
-flags: [generated]
-negative:
-  phase: parse
-  type: SyntaxError
-info: |
-    Class Definitions / Static Semantics: Early Errors
-
-    ClassElement : static MethodDefinition
-        It is a Syntax Error if PropName of MethodDefinition is "prototype"
-
----*/
-
-
-throw "Test262: This statement should not be evaluated.";
-
-class C {
-  static constructor() {}
-  constructor() {} // stacks with a valid constructor
-}
diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js
index 1de086e4f49932a5a2dcd9d59189561d2641d33a..222486686efee5ab60c3eabd3a12b217c8041f56 100644
--- a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js
+++ b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js
@@ -21,5 +21,5 @@ info: |
 throw "Test262: This statement should not be evaluated.";
 
 class C {
-  static set prototype() {}
+  static set prototype(_) {}
 }
diff --git a/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js b/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js
index 6ff13c742753381759e8d73e0a5ab8b1afa67c45..ef89e5b175e8c394ef2f21b2974ce1e68503e268 100644
--- a/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js
+++ b/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js
@@ -21,7 +21,7 @@ info: |
 
 class C {
   static get constructor() {}
-  static set constructor() {}
+  static set constructor(_) {}
   constructor() {} // stacks with a valid constructor
 }