diff --git a/src/class-fields/propname-error/cls-decl-variable-name.template b/src/class-fields/propname-error/cls-decl-variable-name.template
index ade7741a30c48ef12bbcbbe702abdc7713346ab6..cbda5b8319321bfe233b48adecaf8491420bbf2b 100644
--- a/src/class-fields/propname-error/cls-decl-variable-name.template
+++ b/src/class-fields/propname-error/cls-decl-variable-name.template
@@ -14,10 +14,9 @@ info: |
 
 var /*{ propname }*/ = 'foo';
 class C {
-  [/*{ propname }*/];
+  /*{ static }*/ [/*{ propname }*/];
 }
 
 var c = new C();
 
 assert.sameValue(c.hasOwnProperty("foo"), true);
-assert.sameValue(C.hasOwnProperty("foo"), false);
diff --git a/src/class-fields/propname-error/cls-expr-variable-name.template b/src/class-fields/propname-error/cls-expr-variable-name.template
index 1435862de583d38536e2426fa4a98050704a54da..50b255197f9f61549b18e6db7c36150cf0c7bcaf 100644
--- a/src/class-fields/propname-error/cls-expr-variable-name.template
+++ b/src/class-fields/propname-error/cls-expr-variable-name.template
@@ -14,10 +14,9 @@ info: |
 
 var /*{ propname }*/ = 'foo';
 var C = class {
-  [/*{ propname }*/];
-};
+  /*{ static }*/ [/*{ propname }*/];
+}
 
 var c = new C();
-assert.sameValue(c.hasOwnProperty("foo"), true);
 
-assert.sameValue(C.hasOwnProperty("foo"), false);
+assert.sameValue(c.hasOwnProperty("foo"), true);
diff --git a/src/class-fields/static-propname-constructor.case b/src/class-fields/static-propname-constructor.case
index ffa6754e204b53655c8071149d36d7b80ba18891..ff3d00af6abefb7d68838d00e5ec6130bd877d3d 100644
--- a/src/class-fields/static-propname-constructor.case
+++ b/src/class-fields/static-propname-constructor.case
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-desc: Static class field cannot have PropName 'constructor'
+desc: static class field forbid PropName 'constructor'
 info: |
 
   // This test file tests the following early error:
diff --git a/src/class-fields/static-propname-prototype.case b/src/class-fields/static-propname-prototype.case
index 9b2e9ab331b5596924fbf38a1c1f1fd2f555b8b0..99d85ff64a6c5118290ce2d77fb0c3b7c42326b7 100644
--- a/src/class-fields/static-propname-prototype.case
+++ b/src/class-fields/static-propname-prototype.case
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-desc: Static class fields cannot have PropName 'prototype'
+desc: static class fields forbid PropName 'prototype'
 info: |
 
   // This test file tests the following early error: