diff --git a/test/built-ins/Number/NaN.js b/test/built-ins/Number/NaN.js
new file mode 100644
index 0000000000000000000000000000000000000000..64b97321c1eb55f5e916c6254eaa877fbaa8caea
--- /dev/null
+++ b/test/built-ins/Number/NaN.js
@@ -0,0 +1,23 @@
+// Copyright (C) 2016 The V8 Project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 20.1.2.10
+esid: sec-number.nan
+description: >
+  "NaN" property descriptor and value of Number
+info: >
+  20.1.2.10 Number.NaN
+
+  The value of Number.NaN is NaN.
+
+  This property has the attributes { [[Writable]]: false, [[Enumerable]]: false,
+  [[Configurable]]: false }.
+includes: [propertyHelper.js]
+---*/
+
+assert.sameValue(Number.NaN, NaN);
+
+verifyNotEnumerable(Number, "NaN");
+verifyNotWritable(Number, "NaN");
+verifyNotConfigurable(Number, "NaN");
diff --git a/test/built-ins/Number/NaN/S15.7.3.4_A1.js b/test/built-ins/Number/NaN/S15.7.3.4_A1.js
deleted file mode 100644
index b717a8d1b819c2095379a7269b0d913e1460726b..0000000000000000000000000000000000000000
--- a/test/built-ins/Number/NaN/S15.7.3.4_A1.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: Number.NaN is Not-a-Number
-es5id: 15.7.3.4_A1
-description: Checking isNaN(Number.NaN)
----*/
-
-// CHECK#1
-if (isNaN(Number.NaN) !== true) {
-  $ERROR('#1: Number.NaN === Not-a-Number');
-}
diff --git a/test/built-ins/Number/NaN/S15.7.3.4_A2.js b/test/built-ins/Number/NaN/S15.7.3.4_A2.js
deleted file mode 100644
index 751913d2025d16dbda9769b6eb4d57c485d48b6c..0000000000000000000000000000000000000000
--- a/test/built-ins/Number/NaN/S15.7.3.4_A2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: Number.NaN is ReadOnly
-es5id: 15.7.3.4_A2
-description: Checking if varying Number.NaN fails
-includes: [propertyHelper.js]
----*/
-
-// CHECK#1
-verifyNotWritable(Number, "NaN", null, 1);
-if (isNaN(Number.NaN) !== true) {
-  $ERROR('#1: Number.NaN = 1; Number.NaN === Not-a-Number');
-}
diff --git a/test/built-ins/Number/NaN/S15.7.3.4_A3.js b/test/built-ins/Number/NaN/S15.7.3.4_A3.js
deleted file mode 100644
index 667cd76474eca94ad035fcaa57a68c7de81a8fe2..0000000000000000000000000000000000000000
--- a/test/built-ins/Number/NaN/S15.7.3.4_A3.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: Number.NaN is DontDelete
-es5id: 15.7.3.4_A3
-description: Checking if deleting Number.NaN fails
-includes: [propertyHelper.js]
----*/
-
-verifyNotConfigurable(Number, "NaN");
-
-// CHECK#1
-try {
-  if (delete Number.NaN !== false) {
-    $ERROR('#1: delete Number.NaN === false');
-  }
-} catch (e) {
-  if (e instanceof Test262Error) throw e;
-  assert(e instanceof TypeError);
-}
diff --git a/test/built-ins/Number/NaN/S15.7.3.4_A4.js b/test/built-ins/Number/NaN/S15.7.3.4_A4.js
deleted file mode 100644
index 198b638796428349287acba160ce1dcbde65c7d3..0000000000000000000000000000000000000000
--- a/test/built-ins/Number/NaN/S15.7.3.4_A4.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: Number.NaN has the attribute DontEnum
-es5id: 15.7.3.4_A4
-description: Checking if enumerating Number.NaN fails
----*/
-
-//CHECK#1
-for(var x in Number) {
-  if(x === "NaN") {
-    $ERROR('#1: Number.NaN has the attribute DontEnum');
-  }
-}
-
-if (Number.propertyIsEnumerable('NaN')) {
-  $ERROR('#2: Number.NaN has the attribute DontEnum');
-}