diff --git a/src/class-elements/field-definition-accessor-no-line-terminator.case b/src/class-elements/field-definition-accessor-no-line-terminator.case
index 3f22404108..260458950e 100644
--- a/src/class-elements/field-definition-accessor-no-line-terminator.case
+++ b/src/class-elements/field-definition-accessor-no-line-terminator.case
@@ -23,6 +23,6 @@ let c = new C();
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, 'accessor'), false);
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, '$'), false);
 assert.sameValue(Object.hasOwnProperty.call(C, 'accessor'), true);
-assert.sameValue(Object.hasOwnProperty.call(C, '$'), true);
+assert.sameValue(Object.hasOwnProperty.call(C, '$'), false);
 assert.sameValue(Object.hasOwnProperty.call(c, 'accessor'), true);
 assert.sameValue(Object.hasOwnProperty.call(c, '$'), true);
diff --git a/src/decorator/decorator-call-expr-identifier-reference.case b/src/decorator/decorator-call-expr-identifier-reference.case
index 9607d403c0..8b29451047 100644
--- a/src/decorator/decorator-call-expr-identifier-reference.case
+++ b/src/decorator/decorator-call-expr-identifier-reference.case
@@ -25,6 +25,7 @@ template: syntax/valid
 function decorator() {
   return () => {};
 }
+var $ = decorator;
 var _ = decorator;
 var \u{6F} = decorator;
 var \u2118 = decorator;
diff --git a/src/decorator/decorator-member-expr-decorator-member-expr.case b/src/decorator/decorator-member-expr-decorator-member-expr.case
index be5fd8ed68..36e294e046 100644
--- a/src/decorator/decorator-member-expr-decorator-member-expr.case
+++ b/src/decorator/decorator-member-expr-decorator-member-expr.case
@@ -15,14 +15,14 @@ template: syntax/valid
 
 //- setup
 let ns = {
-  $() {}
-  _() {}
-  \u{6F}() {}
-  \u2118() {}
-  ZW_\u200C_NJ() {}
-  ZW_\u200D_J() {}
-  yield() {}
-  await() {}
+  $() {},
+  _() {},
+  \u{6F}() {},
+  \u2118() {},
+  ZW_\u200C_NJ() {},
+  ZW_\u200D_J() {},
+  yield() {},
+  await() {},
 }
 
 //- decorators
diff --git a/test/language/expressions/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js b/test/language/expressions/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js
index c754aded11..fffdb04049 100644
--- a/test/language/expressions/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js
+++ b/test/language/expressions/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js
@@ -38,6 +38,7 @@ info: |
 function decorator() {
   return () => {};
 }
+var $ = decorator;
 var _ = decorator;
 var \u{6F} = decorator;
 var \u2118 = decorator;
diff --git a/test/language/expressions/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js b/test/language/expressions/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js
index ebbabb6f0c..5b08042605 100644
--- a/test/language/expressions/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js
+++ b/test/language/expressions/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js
@@ -28,14 +28,14 @@ info: |
 
 ---*/
 let ns = {
-  $() {}
-  _() {}
-  \u{6F}() {}
-  \u2118() {}
-  ZW_\u200C_NJ() {}
-  ZW_\u200D_J() {}
-  yield() {}
-  await() {}
+  $() {},
+  _() {},
+  \u{6F}() {},
+  \u2118() {},
+  ZW_\u200C_NJ() {},
+  ZW_\u200D_J() {},
+  yield() {},
+  await() {},
 }
 
 
diff --git a/test/language/expressions/class/elements/field-definition-accessor-no-line-terminator.js b/test/language/expressions/class/elements/field-definition-accessor-no-line-terminator.js
index 02a0068aed..45b1d4a27d 100644
--- a/test/language/expressions/class/elements/field-definition-accessor-no-line-terminator.js
+++ b/test/language/expressions/class/elements/field-definition-accessor-no-line-terminator.js
@@ -26,6 +26,6 @@ let c = new C();
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, 'accessor'), false);
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, '$'), false);
 assert.sameValue(Object.hasOwnProperty.call(C, 'accessor'), true);
-assert.sameValue(Object.hasOwnProperty.call(C, '$'), true);
+assert.sameValue(Object.hasOwnProperty.call(C, '$'), false);
 assert.sameValue(Object.hasOwnProperty.call(c, 'accessor'), true);
 assert.sameValue(Object.hasOwnProperty.call(c, '$'), true);
diff --git a/test/language/statements/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js b/test/language/statements/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js
index 2744964369..86b8919f74 100644
--- a/test/language/statements/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js
+++ b/test/language/statements/class/decorator/syntax/valid/decorator-call-expr-identifier-reference.js
@@ -39,6 +39,7 @@ info: |
 function decorator() {
   return () => {};
 }
+var $ = decorator;
 var _ = decorator;
 var \u{6F} = decorator;
 var \u2118 = decorator;
diff --git a/test/language/statements/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js b/test/language/statements/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js
index f13312ce55..a43627049c 100644
--- a/test/language/statements/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js
+++ b/test/language/statements/class/decorator/syntax/valid/decorator-member-expr-decorator-member-expr.js
@@ -29,14 +29,14 @@ info: |
 
 ---*/
 let ns = {
-  $() {}
-  _() {}
-  \u{6F}() {}
-  \u2118() {}
-  ZW_\u200C_NJ() {}
-  ZW_\u200D_J() {}
-  yield() {}
-  await() {}
+  $() {},
+  _() {},
+  \u{6F}() {},
+  \u2118() {},
+  ZW_\u200C_NJ() {},
+  ZW_\u200D_J() {},
+  yield() {},
+  await() {},
 }
 
 
diff --git a/test/language/statements/class/elements/field-definition-accessor-no-line-terminator.js b/test/language/statements/class/elements/field-definition-accessor-no-line-terminator.js
index f09f713a4b..11c0d453b6 100644
--- a/test/language/statements/class/elements/field-definition-accessor-no-line-terminator.js
+++ b/test/language/statements/class/elements/field-definition-accessor-no-line-terminator.js
@@ -26,6 +26,6 @@ let c = new C();
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, 'accessor'), false);
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, '$'), false);
 assert.sameValue(Object.hasOwnProperty.call(C, 'accessor'), true);
-assert.sameValue(Object.hasOwnProperty.call(C, '$'), true);
+assert.sameValue(Object.hasOwnProperty.call(C, '$'), false);
 assert.sameValue(Object.hasOwnProperty.call(c, 'accessor'), true);
 assert.sameValue(Object.hasOwnProperty.call(c, '$'), true);