diff --git a/test/language/line-terminators/S7.3_A1.3.js b/test/language/line-terminators/S7.3_A1.3.js
deleted file mode 100644
index f8073d875702b1813fa337c0a0d65726c0a0abcf..0000000000000000000000000000000000000000
--- a/test/language/line-terminators/S7.3_A1.3.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: LINE SEPARATOR (U+2028) may occur between any two tokens
-es5id: 7.3_A1.3
-description: Insert LINE SEPARATOR (\u2028) between tokens of var x=1
----*/
-
-var result;
-
-// CHECK#1
-eval("\u2028var\u2028x\u2028=\u20281\u2028; result = x;");
-if (result !== 1) {
-  $ERROR('#1: eval("\\u2028var\\u2028x\\u2028=\\u20281\\u2028"); result === 1. Actual: ' + (result));
-}
-
-//CHECK#2
-eval("\u2028" + "var" + "\u2028" + "x" + "\u2028" + "=" + "\u2028" + "2" + "\u2028; result = x;");
-if (result !== 2) {
-  $ERROR('#2: eval("\\u2028" + "var" + "\\u2028" + "x" + "\\u2028" + "=" + "\\u2028" + "2" + "\\u2028"); result === 2. Actual: ' + (result));
-}
diff --git a/test/language/line-terminators/S7.3_A1.4.js b/test/language/line-terminators/S7.3_A1.4.js
deleted file mode 100644
index d137ba2dfcd8866e3304d378e4fbc530be98b059..0000000000000000000000000000000000000000
--- a/test/language/line-terminators/S7.3_A1.4.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: PARAGRAPH SEPARATOR (U+2029) may occur between any two tokens
-es5id: 7.3_A1.4
-description: Insert PARAGRAPH SEPARATOR (\u2029) between tokens of var x=1
----*/
-
-var result;
-
-// CHECK#1
-eval("\u2029var\u2029x\u2029=\u20291\u2029; result = x;");
-if (result !== 1) {
-  $ERROR('#1: eval("\\u2029var\\u2029x\\u2029=\\u20291\\u2029"); result === 1. Actual: ' + (result));
-}
-
-//CHECK#2
-eval("\u2029" + "var" + "\u2029" + "x" + "\u2029" + "=" + "\u2029" + "2" + "\u2029; result = x;");
-if (result !== 2) {
-  $ERROR('#2: eval("\\u2029" + "var" + "\\u2029" + "x" + "\\u2029" + "=" + "\\u2029" + "2" + "\\u2029"); result === 2. Actual: ' + (result));
-}
diff --git a/test/language/line-terminators/S7.3_A1.1_T2.js b/test/language/line-terminators/between-tokens-lf.js
similarity index 77%
rename from test/language/line-terminators/S7.3_A1.1_T2.js
rename to test/language/line-terminators/between-tokens-lf.js
index e097f41fcc4d6d7c9235633ce9036567036ebaea..e3081d0f761245cf6beb75638b99cb2bdb8889d5 100644
--- a/test/language/line-terminators/S7.3_A1.1_T2.js
+++ b/test/language/line-terminators/between-tokens-lf.js
@@ -3,15 +3,14 @@
 
 /*---
 info: LINE FEED (U+000A) may occur between any two tokens
+esid: sec-line-terminators
 es5id: 7.3_A1.1_T2
 description: Insert real LINE FEED between tokens of var x=1
 ---*/
 
-//CHECK#1
 var
 x
 =
 1;
-if (x !== 1) {
-  $ERROR('#1: var\\nx\\n=\\n1\\n; x === 1. Actual: ' + (x));
-}
+
+assert.sameValue(x, 1);
diff --git a/test/language/line-terminators/between-tokens-ls.js b/test/language/line-terminators/between-tokens-ls.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d338eb1ba3500305a740048fa10c425654a92e9
--- /dev/null
+++ b/test/language/line-terminators/between-tokens-ls.js
@@ -0,0 +1,13 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: LINE SEPARATOR (U+2028) may occur between any two tokens
+esid: sec-line-terminators
+es5id: 7.3_A1.3
+description: Insert LINE SEPARATOR (\u2028) between tokens of var x=1
+---*/
+
+var
x
=
1
;
+
+assert.sameValue(x, 1);
diff --git a/test/language/line-terminators/between-tokens-ps.js b/test/language/line-terminators/between-tokens-ps.js
new file mode 100644
index 0000000000000000000000000000000000000000..0451419cedc32e37abd56c378093fb3f6b2c7c5d
--- /dev/null
+++ b/test/language/line-terminators/between-tokens-ps.js
@@ -0,0 +1,13 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: PARAGRAPH SEPARATOR (U+2029) may occur between any two tokens
+esid: sec-line-terminators
+es5id: 7.3_A1.4
+description: Insert PARAGRAPH SEPARATOR (\u2029) between tokens of var x=1
+---*/
+
+var
x
=
1
;
+
+assert.sameValue(x, 1);