diff --git a/test/built-ins/JSON/parse/15.12.1.1-0-7.js b/test/built-ins/JSON/parse/15.12.1.1-0-7.js
deleted file mode 100644
index 0f5e758e68ea28725311c8be63dffdbc2c9376ba..0000000000000000000000000000000000000000
--- a/test/built-ins/JSON/parse/15.12.1.1-0-7.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-es5id: 15.12.1.1-0-7
-description: >
-    other category z spaces are not valid JSON whitespace as specified
-    by the production JSONWhitespace.
----*/
-
-assert.throws(SyntaxError, function() {
-    // the following should produce a syntax error
-    JSON.parse('\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u30001234');
-});
diff --git a/test/built-ins/JSON/parse/invalid-whitespace.js b/test/built-ins/JSON/parse/invalid-whitespace.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1242fd052a2e6a4003d5968954c6b9c50f3dd9c
--- /dev/null
+++ b/test/built-ins/JSON/parse/invalid-whitespace.js
@@ -0,0 +1,75 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-json.parse
+es6id: 24.3.1
+es5id: 15.12.1.1-0-7
+description: >
+    other category z spaces are not valid JSON whitespace as specified
+    by the production JSONWhitespace.
+---*/
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u16801');
+}, '\\u1680');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u180e1');
+}, '\\u180e');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20001');
+}, '\\u2000');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20011');
+}, '\\u2001');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20021');
+}, '\\u2002');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20031');
+}, '\\u2003');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20041');
+}, '\\u2004');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20051');
+}, '\\u2005');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20061');
+}, '\\u2006');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20071');
+}, '\\u2007');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20081');
+}, '\\u2008');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u20091');
+}, '\\u2009');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u200a1');
+}, '\\u200a');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u202f1');
+}, '\\u202f');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u205f1');
+}, '\\u205f');
+
+assert.throws(SyntaxError, function() {
+  JSON.parse('\u30001');
+}, '\\u3000');