diff --git a/test/language/keywords/S7.6.1.1_A1.18.js b/test/language/keywords/S7.6.1.1_A1.18.js
deleted file mode 100644
index 60c5f943175e9335f0a8d7a81df6eddb21441cbf..0000000000000000000000000000000000000000
--- a/test/language/keywords/S7.6.1.1_A1.18.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: The "this" token can not be used as identifier
-es5id: 7.6.1.1_A1.18
-description: Checking if execution of "this=1" fails
-negative:
-  phase: early
-  type: ReferenceError
----*/
-
-this = 1;
diff --git a/test/language/keywords/S7.6.1.1_A1.1.js b/test/language/keywords/ident-ref-break.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.1.js
rename to test/language/keywords/ident-ref-break.js
index b272cb85dd08290db825a8ece6872c535803232e..77fe435224c755031aea28f90c6d981cdaaf8ef5 100644
--- a/test/language/keywords/S7.6.1.1_A1.1.js
+++ b/test/language/keywords/ident-ref-break.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "break" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.1
 description: Checking if execution of "break=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.2.js b/test/language/keywords/ident-ref-case.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.2.js
rename to test/language/keywords/ident-ref-case.js
index 9d1416c61a396d87f5bd1930571adef280ef8467..142d6a5e9643228332e849de3f317605da32b675 100644
--- a/test/language/keywords/S7.6.1.1_A1.2.js
+++ b/test/language/keywords/ident-ref-case.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "case" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.2
 description: Checking if execution of "case=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.3.js b/test/language/keywords/ident-ref-catch.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.3.js
rename to test/language/keywords/ident-ref-catch.js
index 38ea1915d765bce1ac1c790fda7063666fdfd65d..3418056d44be20dccf8dc84bee789c1b396f31d5 100644
--- a/test/language/keywords/S7.6.1.1_A1.3.js
+++ b/test/language/keywords/ident-ref-catch.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "catch" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.3
 description: Checking if execution of "catch=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.4.js b/test/language/keywords/ident-ref-continue.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.4.js
rename to test/language/keywords/ident-ref-continue.js
index 65c97315ce76c4474fc3cff561038b8e01ac13ee..ae5ea45f8def33efe995d31b2e0b32440f1cd1da 100644
--- a/test/language/keywords/S7.6.1.1_A1.4.js
+++ b/test/language/keywords/ident-ref-continue.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "continue" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.4
 description: Checking if execution of "contunue=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.5.js b/test/language/keywords/ident-ref-default.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.5.js
rename to test/language/keywords/ident-ref-default.js
index 1c6f9c5e880e3c0a42a98e862de0761a6e374262..e5a24239bb06c231f7ccff26ea0360aa6e56f37a 100644
--- a/test/language/keywords/S7.6.1.1_A1.5.js
+++ b/test/language/keywords/ident-ref-default.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "default" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.5
 description: Checking if execution of "default=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.6.js b/test/language/keywords/ident-ref-delete.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.6.js
rename to test/language/keywords/ident-ref-delete.js
index e8eeac76474a836a232a3a6e4ceba026ed3c77b3..755068558f73e8916b0ac98c341b8b89d95bdd90 100644
--- a/test/language/keywords/S7.6.1.1_A1.6.js
+++ b/test/language/keywords/ident-ref-delete.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "delete" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.6
 description: Checking if execution of "delete=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.7.js b/test/language/keywords/ident-ref-do.js
similarity index 51%
rename from test/language/keywords/S7.6.1.1_A1.7.js
rename to test/language/keywords/ident-ref-do.js
index 310e6476b366b805f61bc4e0460122a47f3037cc..18cf089e648f5100c1a6e509a1eb56c748c96f17 100644
--- a/test/language/keywords/S7.6.1.1_A1.7.js
+++ b/test/language/keywords/ident-ref-do.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "do" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.7
 description: Checking if execution of "do=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.8.js b/test/language/keywords/ident-ref-else.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.8.js
rename to test/language/keywords/ident-ref-else.js
index 8c5817b86d41981be9598c910da02667f5fdebbd..63b3b2b9715775dfac6a8ce44bd760fa4707886c 100644
--- a/test/language/keywords/S7.6.1.1_A1.8.js
+++ b/test/language/keywords/ident-ref-else.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "else" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.8
 description: Checking if execution of "else=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.9.js b/test/language/keywords/ident-ref-finally.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.9.js
rename to test/language/keywords/ident-ref-finally.js
index e4fe13f21dfad1d5f26fb780dd3f9b5fb7f4dd00..110271698ba0aced36b28ed2407ea86e22871d62 100644
--- a/test/language/keywords/S7.6.1.1_A1.9.js
+++ b/test/language/keywords/ident-ref-finally.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "finally" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.9
 description: Checking if execution of "finally=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.10.js b/test/language/keywords/ident-ref-for.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.10.js
rename to test/language/keywords/ident-ref-for.js
index b3d6b9eab5778089b81f24ca804ef93d010457eb..58538df9627f201fbde347d9473e0cc9d13ddfdd 100644
--- a/test/language/keywords/S7.6.1.1_A1.10.js
+++ b/test/language/keywords/ident-ref-for.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "for" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.10
 description: Checking if execution of "for=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.11.js b/test/language/keywords/ident-ref-function.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.11.js
rename to test/language/keywords/ident-ref-function.js
index 6e1479e5f4604df1e3abfdd8d0c6bbeacb4a444c..c6a6046ae88a11aac8d8bee568e92c7eaf5fae95 100644
--- a/test/language/keywords/S7.6.1.1_A1.11.js
+++ b/test/language/keywords/ident-ref-function.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "function" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.11
 description: Checking if execution of "function=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.12.js b/test/language/keywords/ident-ref-if.js
similarity index 51%
rename from test/language/keywords/S7.6.1.1_A1.12.js
rename to test/language/keywords/ident-ref-if.js
index ce3672ffd6e0a0ee5f8a7a701dfc98bd479faf6f..02e3614ef0bf0b3ea4e14ad36875975c64a37b07 100644
--- a/test/language/keywords/S7.6.1.1_A1.12.js
+++ b/test/language/keywords/ident-ref-if.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "if" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.12
 description: Checking if execution of "if=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.13.js b/test/language/keywords/ident-ref-in.js
similarity index 51%
rename from test/language/keywords/S7.6.1.1_A1.13.js
rename to test/language/keywords/ident-ref-in.js
index 4e9d4f00c97a868f153b68373b0a746a824020ae..a3cf5c79b0c7ba287cea9340ac5c6557b350d882 100644
--- a/test/language/keywords/S7.6.1.1_A1.13.js
+++ b/test/language/keywords/ident-ref-in.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "in" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.13
 description: Checking if execution of "in=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.14.js b/test/language/keywords/ident-ref-instanceof.js
similarity index 53%
rename from test/language/keywords/S7.6.1.1_A1.14.js
rename to test/language/keywords/ident-ref-instanceof.js
index 933135025306f437504954f47ec36f9c936cfbe7..26bb6b31993a1708cc80f53f1c3345b7f206e18c 100644
--- a/test/language/keywords/S7.6.1.1_A1.14.js
+++ b/test/language/keywords/ident-ref-instanceof.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "instanceof" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.14
 description: Checking if execution of "instanceof=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.15.js b/test/language/keywords/ident-ref-new.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.15.js
rename to test/language/keywords/ident-ref-new.js
index 6c0865e11d1f5591eba3c44f6967a35b2e6839bb..aef6ecd1d34b80c90e61e296ad3c1edf8ee275c1 100644
--- a/test/language/keywords/S7.6.1.1_A1.15.js
+++ b/test/language/keywords/ident-ref-new.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "new" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.15
 description: Checking if execution of "new=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.16.js b/test/language/keywords/ident-ref-return.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.16.js
rename to test/language/keywords/ident-ref-return.js
index 693b32ec072822cb12bf3e67f54a0a1334e5c428..33b6c8b6ac7bf53303193ae6f74d3f07080d77b4 100644
--- a/test/language/keywords/S7.6.1.1_A1.16.js
+++ b/test/language/keywords/ident-ref-return.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "return" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.16
 description: Checking if execution of "return=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.17.js b/test/language/keywords/ident-ref-switch.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.17.js
rename to test/language/keywords/ident-ref-switch.js
index d388331d06ea9bcca03f927c291c716ae4e5d5a4..a4b7b0586ac8a415988cde970b7e057e44737de6 100644
--- a/test/language/keywords/S7.6.1.1_A1.17.js
+++ b/test/language/keywords/ident-ref-switch.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "switch" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.17
 description: Checking if execution of "switch=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/ident-ref-this.js b/test/language/keywords/ident-ref-this.js
new file mode 100644
index 0000000000000000000000000000000000000000..825c8163171eed14a6528cf6abb05b3205438290
--- /dev/null
+++ b/test/language/keywords/ident-ref-this.js
@@ -0,0 +1,21 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+es5id: 7.6.1.1_A1.18
+description: Checking if execution of "this=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+// It's tempting to write `this = 0`, but that'd be a test to validate `this`
+// is not a valid simple assignment target, cf. tests in language/expressions/assignment.
+// Also see: sec-semantics-static-semantics-isvalidsimpleassignmenttarget
+({this});
diff --git a/test/language/keywords/S7.6.1.1_A1.19.js b/test/language/keywords/ident-ref-throw.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.19.js
rename to test/language/keywords/ident-ref-throw.js
index 6f74ed30df1e354f5f910dca7ad4969314e58c0b..6bde82398a336e149057b59521d589719af86131 100644
--- a/test/language/keywords/S7.6.1.1_A1.19.js
+++ b/test/language/keywords/ident-ref-throw.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "throw" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.19
 description: Checking if execution of "throw=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.20.js b/test/language/keywords/ident-ref-try.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.20.js
rename to test/language/keywords/ident-ref-try.js
index cde696e30512f69187ef8afe40e601acde7501f2..acf2564fd8645043163cf2bc5aa7d96db089c5fc 100644
--- a/test/language/keywords/S7.6.1.1_A1.20.js
+++ b/test/language/keywords/ident-ref-try.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "try" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.20
 description: Checking if execution of "try=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.21.js b/test/language/keywords/ident-ref-typeof.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.21.js
rename to test/language/keywords/ident-ref-typeof.js
index e7728c46ca84b4cf2b25a9e69bf1e7aa05a08449..828411a58aa80c3cfc312018f2579510d9dca87f 100644
--- a/test/language/keywords/S7.6.1.1_A1.21.js
+++ b/test/language/keywords/ident-ref-typeof.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "typeof" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.21
 description: Checking if execution of "typeof=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.22.js b/test/language/keywords/ident-ref-var.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.22.js
rename to test/language/keywords/ident-ref-var.js
index 91f643325d81257463eaa4976483e78d4bf29d03..0d7e5730e2210610fd478868623d4250b2b839e0 100644
--- a/test/language/keywords/S7.6.1.1_A1.22.js
+++ b/test/language/keywords/ident-ref-var.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "var" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.22
 description: Checking if execution of "var=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.23.js b/test/language/keywords/ident-ref-void.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.23.js
rename to test/language/keywords/ident-ref-void.js
index c1e3120051ea4c73e7a78054d164723e04c9688a..e038f917ee496df18406dc00ce994c8e2562ba9b 100644
--- a/test/language/keywords/S7.6.1.1_A1.23.js
+++ b/test/language/keywords/ident-ref-void.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "void" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.23
 description: Checking if execution of "void=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.24.js b/test/language/keywords/ident-ref-while.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.24.js
rename to test/language/keywords/ident-ref-while.js
index 9fb3767f18ce3f6acfbba742570109a8e843f2de..4637dedad0fce06eb5d25395f28d2600fe8dd293 100644
--- a/test/language/keywords/S7.6.1.1_A1.24.js
+++ b/test/language/keywords/ident-ref-while.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "while" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.24
 description: Checking if execution of "while=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError
diff --git a/test/language/keywords/S7.6.1.1_A1.25.js b/test/language/keywords/ident-ref-with.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.25.js
rename to test/language/keywords/ident-ref-with.js
index 869d56d51959235a6cfb581c8b722eea0efc6b1f..da3e4e749b27681f8a9d1440e6b5198ef422dcf6 100644
--- a/test/language/keywords/S7.6.1.1_A1.25.js
+++ b/test/language/keywords/ident-ref-with.js
@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "with" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.25
 description: Checking if execution of "with=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError