diff --git a/test/language/expressions/postfix-decrement/arguments-nostrict.js b/test/language/expressions/postfix-decrement/arguments-nostrict.js
index e851a7c8fb0b72bbd604ac1d9c23e8c4eb7ea39e..a6dc6e9d80f3257bc6b6289ca31936adc394d890 100644
--- a/test/language/expressions/postfix-decrement/arguments-nostrict.js
+++ b/test/language/expressions/postfix-decrement/arguments-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid. (arguments)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : LeftHandSideExpression --
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression : LeftHandSideExpression --
 
     It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of LeftHandSideExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 arguments--;
diff --git a/test/language/expressions/postfix-decrement/eval-nostrict.js b/test/language/expressions/postfix-decrement/eval-nostrict.js
index 8e7131b6e132544afb8eca260accbb3975bdb43b..3aac9b983175221c9d71eac6dd0fdc3c298afb30 100644
--- a/test/language/expressions/postfix-decrement/eval-nostrict.js
+++ b/test/language/expressions/postfix-decrement/eval-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid. (eval)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : LeftHandSideExpression --
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression : LeftHandSideExpression --
 
     It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of LeftHandSideExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 eval--;
diff --git a/test/language/expressions/postfix-increment/arguments-nostrict.js b/test/language/expressions/postfix-increment/arguments-nostrict.js
index bdc6a559a5180673fa9a47da0f47640b6c6d90a4..0c7fa5bbb484dc6ffa00c6bf3e4fb770b8292719 100644
--- a/test/language/expressions/postfix-increment/arguments-nostrict.js
+++ b/test/language/expressions/postfix-increment/arguments-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid. (arguments)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : LeftHandSideExpression ++
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression : LeftHandSideExpression ++
 
     It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of LeftHandSideExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 arguments++;
diff --git a/test/language/expressions/postfix-increment/eval-nostrict.js b/test/language/expressions/postfix-increment/eval-nostrict.js
index 10135e5d0bd87c905ce7aa96e05318162aab9efb..94e7a8288a70c45ce8db24a8b8f0ddd56b569a6a 100644
--- a/test/language/expressions/postfix-increment/eval-nostrict.js
+++ b/test/language/expressions/postfix-increment/eval-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid. (eval)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : LeftHandSideExpression ++
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression : LeftHandSideExpression ++
 
     It is an early Reference Error if AssignmentTargetType of LeftHandSideExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of LeftHandSideExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 eval++;
diff --git a/test/language/expressions/prefix-decrement/arguments-nostrict.js b/test/language/expressions/prefix-decrement/arguments-nostrict.js
index 0d3aeb831e7dccd6fedfc2ff1378dffeb3c0b8e9..7afe1169fd5b5bf0223180d239d5a0d6c29d966d 100644
--- a/test/language/expressions/prefix-decrement/arguments-nostrict.js
+++ b/test/language/expressions/prefix-decrement/arguments-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid. (arguments)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : -- UnaryExpression
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression -- UnaryExpression
 
     It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of UnaryExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 --arguments;
diff --git a/test/language/expressions/prefix-decrement/eval-nostrict.js b/test/language/expressions/prefix-decrement/eval-nostrict.js
index 0716961449eab7e71232e7eb1b02c2af0b001612..b9a88eca0dd50ed72dfd994a325f614ba9d4ab7f 100644
--- a/test/language/expressions/prefix-decrement/eval-nostrict.js
+++ b/test/language/expressions/prefix-decrement/eval-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid. (eval)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : -- UnaryExpression
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression -- UnaryExpression
 
     It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of UnaryExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 --eval;
diff --git a/test/language/expressions/prefix-increment/arguments-nostrict.js b/test/language/expressions/prefix-increment/arguments-nostrict.js
index 469292acbdeaeb74ec53425f19b157de396e7232..306b28ef8396215ae673b7aa0a1d1d7fd498ecca 100644
--- a/test/language/expressions/prefix-increment/arguments-nostrict.js
+++ b/test/language/expressions/prefix-increment/arguments-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid. (arguments)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : ++ UnaryExpression
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression ++ UnaryExpression
 
     It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of UnaryExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 ++arguments;
diff --git a/test/language/expressions/prefix-increment/eval-nostrict.js b/test/language/expressions/prefix-increment/eval-nostrict.js
index 9f6258bcd98320508f63f1e0bda79ade85054c20..110c2738ed9bc32eceea3a4db50aad00fe8ba678 100644
--- a/test/language/expressions/prefix-increment/eval-nostrict.js
+++ b/test/language/expressions/prefix-increment/eval-nostrict.js
@@ -7,24 +7,19 @@ description: >
   It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid. (eval)
 info: |
 
-  sec-update-expressions-static-semantics-assignmenttargettype
+  sec-identifiers-static-semantics-assignmenttargettype
 
-    UpdateExpression : ++ UnaryExpression
-
-    Return invalid.
+    1. If this IdentifierReference is contained in strict mode code and StringValue of Identifier is "eval" or  "arguments", return strict.
+    2. Return simple.
 
   sec-update-expressions-static-semantics-early-errors
 
     UpdateExpression ++ UnaryExpression
 
     It is an early Reference Error if AssignmentTargetType of UnaryExpression is invalid.
+    It is an early Syntax Error if AssignmentTargetType of UnaryExpression is strict.
 
 flags: [noStrict]
-negative:
-  phase: parse
-  type: ReferenceError
 ---*/
 
-$DONOTEVALUATE();
-
 ++eval;