diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T1.js b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T1.js
index 226042ee9d82efaf6ae6e941e0468871375339b3..457afcd321e044751f9416022a03f886dba0139e 100644
--- a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T1.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T1.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "--" is not allowed
 es5id: 11.3.2_A1.1_T1
 description: Checking Line Feed
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u000A--");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u000A--");
+});
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T2.js b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T2.js
index 5f9564515efc9651df6cf351d825d1cee5b80d4f..c34cb927b247327239dcae3f3fa4c843e8340043 100644
--- a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T2.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T2.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "--" is not allowed
 es5id: 11.3.2_A1.1_T2
 description: Checking Carriage Return
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u000D--");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u000D--");
+});
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T3.js b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T3.js
index e691a9a9a0aa202d4d33e23657f34f5f4e7efc2b..6ea38029abb40be635dd81a86cd529b77267fb3a 100644
--- a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T3.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T3.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "--" is not allowed
 es5id: 11.3.2_A1.1_T3
 description: Checking Page separator
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u2028--");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u2028--");
+});
diff --git a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T4.js b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T4.js
index 9dcac1ee08e610377d11e27d648fd1fa22db2d0b..e83bfb49fba9e76a3583e1a50a35d27fab370a19 100644
--- a/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T4.js
+++ b/test/language/expressions/postfix-decrement/S11.3.2_A1.1_T4.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "--" is not allowed
 es5id: 11.3.2_A1.1_T4
 description: Checking Line separator
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u2029--");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u2029--");
+});
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T1.js b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T1.js
index 3e678b5ed253745d8f679967127978dd3f446627..9800f7c545a181ab75c9a05e01f851498198b798 100644
--- a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T1.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T1.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "++" is not allowed
 es5id: 11.3.1_A1.1_T1
 description: Checking Line Feed
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u000A++");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u000A++");
+});
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T2.js b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T2.js
index 296ea00009a5db848f192f712b160c164caf02be..58dac29479878369681506822a9707de0118da46 100644
--- a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T2.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T2.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "++" is not allowed
 es5id: 11.3.1_A1.1_T2
 description: Carriage Return
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u000D++");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u000D++");
+});
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T3.js b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T3.js
index d6a51bd559de62c0820bcd42229ebe0a18c81306..01eb9226159f1f46ae1eeee4042932c5bd93bcc9 100644
--- a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T3.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T3.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "++" is not allowed
 es5id: 11.3.1_A1.1_T3
 description: Checking Line Seprator
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u2028++");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u2028++");
+});
diff --git a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T4.js b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T4.js
index 8afd23013d513a6070deedfa016f40184fad4565..3e5727708f002e34891d3fb0d136be6cc954c3c7 100644
--- a/test/language/expressions/postfix-increment/S11.3.1_A1.1_T4.js
+++ b/test/language/expressions/postfix-increment/S11.3.1_A1.1_T4.js
@@ -5,8 +5,8 @@
 info: Line Terminator between LeftHandSideExpression and "++" is not allowed
 es5id: 11.3.1_A1.1_T4
 description: Checking Paragraph separator
-negative: SyntaxError
 ---*/
 
-//CHECK#1
-eval("var x = 1; x\u2029++");
+assert.throws(SyntaxError, function() {
+  eval("var x = 1; x\u2029++");
+});
diff --git a/test/language/line-terminators/S7.3_A2.1_T1.js b/test/language/line-terminators/S7.3_A2.1_T1.js
index 3e8cad14aec9afa5fa49052a5f769f6656a36e1d..424b17027887269a6144c25fa4d4dca5f8d55b52 100644
--- a/test/language/line-terminators/S7.3_A2.1_T1.js
+++ b/test/language/line-terminators/S7.3_A2.1_T1.js
@@ -5,10 +5,8 @@
 info: LINE FEED (U+000A) within strings is not allowed
 es5id: 7.3_A2.1_T1
 description: Insert LINE FEED (\u000A) into string
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-if (eval("'\u000Astr\u000Aing\u000A'") === "\u000Astr\u000Aing\u000A") {
-  $ERROR('#1: eval("\'\\u000Astr\\u000Aing\\u000A\'") === "\\u000Astr\\u000Aing\\u000A"');
-}
+assert.throws(SyntaxError, function() {
+  eval("'\u000Astr\u000Aing\u000A'");
+});
diff --git a/test/language/line-terminators/S7.3_A2.2_T1.js b/test/language/line-terminators/S7.3_A2.2_T1.js
index bb50b71a302133f7af20a3eb0a0b583341f51162..cb4e39387d1fd2246c6162aa4b344eae16ea12c7 100644
--- a/test/language/line-terminators/S7.3_A2.2_T1.js
+++ b/test/language/line-terminators/S7.3_A2.2_T1.js
@@ -5,10 +5,8 @@
 info: CARRIAGE RETURN (U+000D) within strings is not allowed
 es5id: 7.3_A2.2_T1
 description: Insert CARRIAGE RETURN (\u000D) into string
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-if (eval("'\u000Dstr\u000Ding\u000D'") === "\u000Dstr\u000Ding\u000D") {
-  $ERROR('#1: eval("\'\\u000Dstr\\u000Ding\\u000D\'") === "\\u000Dstr\\u000Ding\\u000D"');
-}
+assert.throws(SyntaxError, function() {
+  eval("'\u000Dstr\u000Ding\u000D'");
+});
diff --git a/test/language/line-terminators/S7.3_A2.3.js b/test/language/line-terminators/S7.3_A2.3.js
index 439140a558b3451d208bb39ef9e082e9f78dc5a2..fb26e7e7a7133c940835c462cf6bc8a3630978a7 100644
--- a/test/language/line-terminators/S7.3_A2.3.js
+++ b/test/language/line-terminators/S7.3_A2.3.js
@@ -5,10 +5,8 @@
 info: LINE SEPARATOR (U+2028) within strings is not allowed
 es5id: 7.3_A2.3
 description: Insert LINE SEPARATOR (\u2028) into string
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-if (eval("'\u2028str\u2028ing\u2028'") === "\u2028str\u2028ing\u2028") {
-  $ERROR('#1: eval("\'\\u2028str\\u2028ing\\u2028\'") === "\\u2028str\\u2028ing\\u2028"');
-}
+assert.throws(SyntaxError, function() {
+  eval("'\u2028str\u2028ing\u2028'");
+});
diff --git a/test/language/line-terminators/S7.3_A2.4.js b/test/language/line-terminators/S7.3_A2.4.js
index 9db6e42e8b9ed25c8fbf73c4b891b02d29170966..582a84f6429e5744ddeae8f78a1a1dad1bff4049 100644
--- a/test/language/line-terminators/S7.3_A2.4.js
+++ b/test/language/line-terminators/S7.3_A2.4.js
@@ -5,10 +5,9 @@
 info: PARAGRAPH SEPARATOR (U+2029) within strings is not allowed
 es5id: 7.3_A2.4
 description: Insert PARAGRAPH SEPARATOR (\u2029) into string
-negative: SyntaxError
 ---*/
 
 // CHECK#1
-if (eval("'\u2029str\u2029ing\u2029'") === "\u2029str\u2029ing\u2029") {
-  $ERROR('#1: eval("\'\\u2029str\\u2029ing\\u2029\'") === "\\u2029str\\u2029ing\\u2029"');
-}
+assert.throws(SyntaxError, function() {
+  eval("'\u2029str\u2029ing\u2029'");
+});
diff --git a/test/language/line-terminators/S7.3_A3.1_T2.js b/test/language/line-terminators/S7.3_A3.1_T2.js
index 61d2bbbaa32d4a4318a396e3a70edc8c636dd765..2b37ae5146394d8a090e8e4176d78a5da7822333 100644
--- a/test/language/line-terminators/S7.3_A3.1_T2.js
+++ b/test/language/line-terminators/S7.3_A3.1_T2.js
@@ -5,8 +5,8 @@
 info: Single line comments can not contain LINE FEED (U+000A) inside
 es5id: 7.3_A3.1_T2
 description: Insert LINE FEED (\u000A) into begin of single line comment
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-eval("//\u000A single line comment");
+assert.throws(SyntaxError, function() {
+  eval("//\u000A single line comment");
+});
diff --git a/test/language/line-terminators/S7.3_A3.2_T2.js b/test/language/line-terminators/S7.3_A3.2_T2.js
index 04cde82e4e429e984d9ac79db105588acf270309..580e558a1b9cd1cce9efa2ac462a7554ecaa5250 100644
--- a/test/language/line-terminators/S7.3_A3.2_T2.js
+++ b/test/language/line-terminators/S7.3_A3.2_T2.js
@@ -5,8 +5,8 @@
 info: Single line comments can not contain CARRIAGE RETURN (U+000D) inside
 es5id: 7.3_A3.2_T2
 description: Insert CARRIAGE RETURN (\u000D) into begin of single line comment
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-eval("//\u000D single line comment");
+assert.throws(SyntaxError, function() {
+  eval("//\u000D single line comment");
+});
diff --git a/test/language/line-terminators/S7.3_A3.3_T2.js b/test/language/line-terminators/S7.3_A3.3_T2.js
index 07d3f855a2d49311839cfcf7c8a6d2c42e67e7bd..fd825222018038b3b26dbdc81f1cfb240d8d86fd 100644
--- a/test/language/line-terminators/S7.3_A3.3_T2.js
+++ b/test/language/line-terminators/S7.3_A3.3_T2.js
@@ -5,8 +5,8 @@
 info: Single line comments can not contain LINE SEPARATOR (U+2028) inside
 es5id: 7.3_A3.3_T2
 description: Insert LINE SEPARATOR (\u2028) into begin of single line comment
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-eval("//\u2028 single line comment");
+assert.throws(SyntaxError, function() {
+  eval("//\u2028 single line comment");
+});
diff --git a/test/language/line-terminators/S7.3_A3.4_T2.js b/test/language/line-terminators/S7.3_A3.4_T2.js
index 6393ba801a6056f4d0706114de1e19c439dac9f0..953b894a02d70a09513704a4b228fdd4f7f02e45 100644
--- a/test/language/line-terminators/S7.3_A3.4_T2.js
+++ b/test/language/line-terminators/S7.3_A3.4_T2.js
@@ -7,8 +7,8 @@ es5id: 7.3_A3.4_T2
 description: >
     Insert PARAGRAPH SEPARATOR (\u2029) into begin of single line
     comment
-negative: SyntaxError
 ---*/
 
-// CHECK#1
-eval("//\u2029 single line comment");
+assert.throws(SyntaxError, function() {
+  eval("//\u2029 single line comment");
+});
diff --git a/test/language/literals/numeric/7.8.3-3gs.js b/test/language/literals/numeric/7.8.3-3gs.js
index b29697437cccb15941f895fd469caea03dde8da9..e82e6cffe79a20021cc3f2cfdead44127d36c860 100644
--- a/test/language/literals/numeric/7.8.3-3gs.js
+++ b/test/language/literals/numeric/7.8.3-3gs.js
@@ -6,9 +6,10 @@ es5id: 7.8.3-3gs
 description: >
     Strict Mode - octal extension is forbidden in strict mode (after a
     hex number is assigned to a variable from an eval)
-negative: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-var a;
-eval("a = 0x1;a = 01;");
+var a;
+assert.throws(SyntaxError, function() {
+  eval("a = 0x1;a = 01;");
+});