diff --git a/test/built-ins/RegExp/S15.10.2.12_A2_T1.js b/test/built-ins/RegExp/S15.10.2.12_A2_T1.js
deleted file mode 100644
index d89d603100..0000000000
--- a/test/built-ins/RegExp/S15.10.2.12_A2_T1.js
+++ /dev/null
@@ -1,530 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: |
-    The production CharacterClassEscape :: S evaluates by returning
-    the set of all characters not included in the set returned by
-    CharacterClassEscape :: s
-es5id: 15.10.2.12_A2_T1
-description: WhiteSpace
----*/
-
-var i0 = "";
-for (var j = 0x0000; j < 0x0400; j++)
-  i0 += String.fromCharCode(j);
-var o0 = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0";
-if (i0.replace(/\S+/g, "") !== o0) {
-  $ERROR("#0: Error matching character class \S between character 0 and 3ff");
-}
-
-var i1 = "";
-for (var j = 0x0400; j < 0x0800; j++)
-  i1 += String.fromCharCode(j);
-var o1 = "";
-if (i1.replace(/\S+/g, "") !== o1) {
-  $ERROR("#1: Error matching character class \S between character 400 and 7ff");
-}
-
-var i2 = "";
-for (var j = 0x0800; j < 0x0C00; j++)
-  i2 += String.fromCharCode(j);
-var o2 = "";
-if (i2.replace(/\S+/g, "") !== o2) {
-  $ERROR("#2: Error matching character class \S between character 800 and bff");
-}
-
-var i3 = "";
-for (var j = 0x0C00; j < 0x1000; j++)
-  i3 += String.fromCharCode(j);
-var o3 = "";
-if (i3.replace(/\S+/g, "") !== o3) {
-  $ERROR("#3: Error matching character class \S between character c00 and fff");
-}
-
-var i4 = "";
-for (var j = 0x1000; j < 0x1400; j++)
-  i4 += String.fromCharCode(j);
-var o4 = "";
-if (i4.replace(/\S+/g, "") !== o4) {
-  $ERROR("#4: Error matching character class \S between character 1000 and 13ff");
-}
-
-var i5 = "";
-for (var j = 0x1400; j < 0x1800; j++)
-  i5 += String.fromCharCode(j);
-var o5 = "\u1680";
-if (i5.replace(/\S+/g, "") !== o5) {
-  $ERROR("#5: Error matching character class \S between character 1400 and 17ff");
-}
-
-var i6 = "";
-for (var j = 0x1800; j < 0x1C00; j++)
-  i6 += String.fromCharCode(j);
-var o6 = "";
-if (i6.replace(/\S+/g, "") !== o6) {
-  $ERROR("#6: Error matching character class \S between character 1800 and 1bff");
-}
-
-var i7 = "";
-for (var j = 0x1C00; j < 0x2000; j++)
-  i7 += String.fromCharCode(j);
-var o7 = "";
-if (i7.replace(/\S+/g, "") !== o7) {
-  $ERROR("#7: Error matching character class \S between character 1c00 and 1fff");
-}
-
-var i8 = "";
-for (var j = 0x2000; j < 0x2400; j++)
-  i8 += String.fromCharCode(j);
-var o8 = "\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F";
-if (i8.replace(/\S+/g, "") !== o8) {
-  $ERROR("#8: Error matching character class \S between character 2000 and 23ff");
-}
-
-var i9 = "";
-for (var j = 0x2400; j < 0x2800; j++)
-  i9 += String.fromCharCode(j);
-var o9 = "";
-if (i9.replace(/\S+/g, "") !== o9) {
-  $ERROR("#9: Error matching character class \S between character 2400 and 27ff");
-}
-
-var i10 = "";
-for (var j = 0x2800; j < 0x2C00; j++)
-  i10 += String.fromCharCode(j);
-var o10 = "";
-if (i10.replace(/\S+/g, "") !== o10) {
-  $ERROR("#10: Error matching character class \S between character 2800 and 2bff");
-}
-
-var i11 = "";
-for (var j = 0x2C00; j < 0x3000; j++)
-  i11 += String.fromCharCode(j);
-var o11 = "";
-if (i11.replace(/\S+/g, "") !== o11) {
-  $ERROR("#11: Error matching character class \S between character 2c00 and 2fff");
-}
-
-var i12 = "";
-for (var j = 0x3000; j < 0x3400; j++)
-  i12 += String.fromCharCode(j);
-var o12 = "\u3000";
-if (i12.replace(/\S+/g, "") !== o12) {
-  $ERROR("#12: Error matching character class \S between character 3000 and 33ff");
-}
-
-var i13 = "";
-for (var j = 0x3400; j < 0x3800; j++)
-  i13 += String.fromCharCode(j);
-var o13 = "";
-if (i13.replace(/\S+/g, "") !== o13) {
-  $ERROR("#13: Error matching character class \S between character 3400 and 37ff");
-}
-
-var i14 = "";
-for (var j = 0x3800; j < 0x3C00; j++)
-  i14 += String.fromCharCode(j);
-var o14 = "";
-if (i14.replace(/\S+/g, "") !== o14) {
-  $ERROR("#14: Error matching character class \S between character 3800 and 3bff");
-}
-
-var i15 = "";
-for (var j = 0x3C00; j < 0x4000; j++)
-  i15 += String.fromCharCode(j);
-var o15 = "";
-if (i15.replace(/\S+/g, "") !== o15) {
-  $ERROR("#15: Error matching character class \S between character 3c00 and 3fff");
-}
-
-var i16 = "";
-for (var j = 0x4000; j < 0x4400; j++)
-  i16 += String.fromCharCode(j);
-var o16 = "";
-if (i16.replace(/\S+/g, "") !== o16) {
-  $ERROR("#16: Error matching character class \S between character 4000 and 43ff");
-}
-
-var i17 = "";
-for (var j = 0x4400; j < 0x4800; j++)
-  i17 += String.fromCharCode(j);
-var o17 = "";
-if (i17.replace(/\S+/g, "") !== o17) {
-  $ERROR("#17: Error matching character class \S between character 4400 and 47ff");
-}
-
-var i18 = "";
-for (var j = 0x4800; j < 0x4C00; j++)
-  i18 += String.fromCharCode(j);
-var o18 = "";
-if (i18.replace(/\S+/g, "") !== o18) {
-  $ERROR("#18: Error matching character class \S between character 4800 and 4bff");
-}
-
-var i19 = "";
-for (var j = 0x4C00; j < 0x5000; j++)
-  i19 += String.fromCharCode(j);
-var o19 = "";
-if (i19.replace(/\S+/g, "") !== o19) {
-  $ERROR("#19: Error matching character class \S between character 4c00 and 4fff");
-}
-
-var i20 = "";
-for (var j = 0x5000; j < 0x5400; j++)
-  i20 += String.fromCharCode(j);
-var o20 = "";
-if (i20.replace(/\S+/g, "") !== o20) {
-  $ERROR("#20: Error matching character class \S between character 5000 and 53ff");
-}
-
-var i21 = "";
-for (var j = 0x5400; j < 0x5800; j++)
-  i21 += String.fromCharCode(j);
-var o21 = "";
-if (i21.replace(/\S+/g, "") !== o21) {
-  $ERROR("#21: Error matching character class \S between character 5400 and 57ff");
-}
-
-var i22 = "";
-for (var j = 0x5800; j < 0x5C00; j++)
-  i22 += String.fromCharCode(j);
-var o22 = "";
-if (i22.replace(/\S+/g, "") !== o22) {
-  $ERROR("#22: Error matching character class \S between character 5800 and 5bff");
-}
-
-var i23 = "";
-for (var j = 0x5C00; j < 0x6000; j++)
-  i23 += String.fromCharCode(j);
-var o23 = "";
-if (i23.replace(/\S+/g, "") !== o23) {
-  $ERROR("#23: Error matching character class \S between character 5c00 and 5fff");
-}
-
-var i24 = "";
-for (var j = 0x6000; j < 0x6400; j++)
-  i24 += String.fromCharCode(j);
-var o24 = "";
-if (i24.replace(/\S+/g, "") !== o24) {
-  $ERROR("#24: Error matching character class \S between character 6000 and 63ff");
-}
-
-var i25 = "";
-for (var j = 0x6400; j < 0x6800; j++)
-  i25 += String.fromCharCode(j);
-var o25 = "";
-if (i25.replace(/\S+/g, "") !== o25) {
-  $ERROR("#25: Error matching character class \S between character 6400 and 67ff");
-}
-
-var i26 = "";
-for (var j = 0x6800; j < 0x6C00; j++)
-  i26 += String.fromCharCode(j);
-var o26 = "";
-if (i26.replace(/\S+/g, "") !== o26) {
-  $ERROR("#26: Error matching character class \S between character 6800 and 6bff");
-}
-
-var i27 = "";
-for (var j = 0x6C00; j < 0x7000; j++)
-  i27 += String.fromCharCode(j);
-var o27 = "";
-if (i27.replace(/\S+/g, "") !== o27) {
-  $ERROR("#27: Error matching character class \S between character 6c00 and 6fff");
-}
-
-var i28 = "";
-for (var j = 0x7000; j < 0x7400; j++)
-  i28 += String.fromCharCode(j);
-var o28 = "";
-if (i28.replace(/\S+/g, "") !== o28) {
-  $ERROR("#28: Error matching character class \S between character 7000 and 73ff");
-}
-
-var i29 = "";
-for (var j = 0x7400; j < 0x7800; j++)
-  i29 += String.fromCharCode(j);
-var o29 = "";
-if (i29.replace(/\S+/g, "") !== o29) {
-  $ERROR("#29: Error matching character class \S between character 7400 and 77ff");
-}
-
-var i30 = "";
-for (var j = 0x7800; j < 0x7C00; j++)
-  i30 += String.fromCharCode(j);
-var o30 = "";
-if (i30.replace(/\S+/g, "") !== o30) {
-  $ERROR("#30: Error matching character class \S between character 7800 and 7bff");
-}
-
-var i31 = "";
-for (var j = 0x7C00; j < 0x8000; j++)
-  i31 += String.fromCharCode(j);
-var o31 = "";
-if (i31.replace(/\S+/g, "") !== o31) {
-  $ERROR("#31: Error matching character class \S between character 7c00 and 7fff");
-}
-
-var i32 = "";
-for (var j = 0x8000; j < 0x8400; j++)
-  i32 += String.fromCharCode(j);
-var o32 = "";
-if (i32.replace(/\S+/g, "") !== o32) {
-  $ERROR("#32: Error matching character class \S between character 8000 and 83ff");
-}
-
-var i33 = "";
-for (var j = 0x8400; j < 0x8800; j++)
-  i33 += String.fromCharCode(j);
-var o33 = "";
-if (i33.replace(/\S+/g, "") !== o33) {
-  $ERROR("#33: Error matching character class \S between character 8400 and 87ff");
-}
-
-var i34 = "";
-for (var j = 0x8800; j < 0x8C00; j++)
-  i34 += String.fromCharCode(j);
-var o34 = "";
-if (i34.replace(/\S+/g, "") !== o34) {
-  $ERROR("#34: Error matching character class \S between character 8800 and 8bff");
-}
-
-var i35 = "";
-for (var j = 0x8C00; j < 0x9000; j++)
-  i35 += String.fromCharCode(j);
-var o35 = "";
-if (i35.replace(/\S+/g, "") !== o35) {
-  $ERROR("#35: Error matching character class \S between character 8c00 and 8fff");
-}
-
-var i36 = "";
-for (var j = 0x9000; j < 0x9400; j++)
-  i36 += String.fromCharCode(j);
-var o36 = "";
-if (i36.replace(/\S+/g, "") !== o36) {
-  $ERROR("#36: Error matching character class \S between character 9000 and 93ff");
-}
-
-var i37 = "";
-for (var j = 0x9400; j < 0x9800; j++)
-  i37 += String.fromCharCode(j);
-var o37 = "";
-if (i37.replace(/\S+/g, "") !== o37) {
-  $ERROR("#37: Error matching character class \S between character 9400 and 97ff");
-}
-
-var i38 = "";
-for (var j = 0x9800; j < 0x9C00; j++)
-  i38 += String.fromCharCode(j);
-var o38 = "";
-if (i38.replace(/\S+/g, "") !== o38) {
-  $ERROR("#38: Error matching character class \S between character 9800 and 9bff");
-}
-
-var i39 = "";
-for (var j = 0x9C00; j < 0xA000; j++)
-  i39 += String.fromCharCode(j);
-var o39 = "";
-if (i39.replace(/\S+/g, "") !== o39) {
-  $ERROR("#39: Error matching character class \S between character 9c00 and 9fff");
-}
-
-var i40 = "";
-for (var j = 0xA000; j < 0xA400; j++)
-  i40 += String.fromCharCode(j);
-var o40 = "";
-if (i40.replace(/\S+/g, "") !== o40) {
-  $ERROR("#40: Error matching character class \S between character a000 and a3ff");
-}
-
-var i41 = "";
-for (var j = 0xA400; j < 0xA800; j++)
-  i41 += String.fromCharCode(j);
-var o41 = "";
-if (i41.replace(/\S+/g, "") !== o41) {
-  $ERROR("#41: Error matching character class \S between character a400 and a7ff");
-}
-
-var i42 = "";
-for (var j = 0xA800; j < 0xAC00; j++)
-  i42 += String.fromCharCode(j);
-var o42 = "";
-if (i42.replace(/\S+/g, "") !== o42) {
-  $ERROR("#42: Error matching character class \S between character a800 and abff");
-}
-
-var i43 = "";
-for (var j = 0xAC00; j < 0xB000; j++)
-  i43 += String.fromCharCode(j);
-var o43 = "";
-if (i43.replace(/\S+/g, "") !== o43) {
-  $ERROR("#43: Error matching character class \S between character ac00 and afff");
-}
-
-var i44 = "";
-for (var j = 0xB000; j < 0xB400; j++)
-  i44 += String.fromCharCode(j);
-var o44 = "";
-if (i44.replace(/\S+/g, "") !== o44) {
-  $ERROR("#44: Error matching character class \S between character b000 and b3ff");
-}
-
-var i45 = "";
-for (var j = 0xB400; j < 0xB800; j++)
-  i45 += String.fromCharCode(j);
-var o45 = "";
-if (i45.replace(/\S+/g, "") !== o45) {
-  $ERROR("#45: Error matching character class \S between character b400 and b7ff");
-}
-
-var i46 = "";
-for (var j = 0xB800; j < 0xBC00; j++)
-  i46 += String.fromCharCode(j);
-var o46 = "";
-if (i46.replace(/\S+/g, "") !== o46) {
-  $ERROR("#46: Error matching character class \S between character b800 and bbff");
-}
-
-var i47 = "";
-for (var j = 0xBC00; j < 0xC000; j++)
-  i47 += String.fromCharCode(j);
-var o47 = "";
-if (i47.replace(/\S+/g, "") !== o47) {
-  $ERROR("#47: Error matching character class \S between character bc00 and bfff");
-}
-
-var i48 = "";
-for (var j = 0xC000; j < 0xC400; j++)
-  i48 += String.fromCharCode(j);
-var o48 = "";
-if (i48.replace(/\S+/g, "") !== o48) {
-  $ERROR("#48: Error matching character class \S between character c000 and c3ff");
-}
-
-var i49 = "";
-for (var j = 0xC400; j < 0xC800; j++)
-  i49 += String.fromCharCode(j);
-var o49 = "";
-if (i49.replace(/\S+/g, "") !== o49) {
-  $ERROR("#49: Error matching character class \S between character c400 and c7ff");
-}
-
-var i50 = "";
-for (var j = 0xC800; j < 0xCC00; j++)
-  i50 += String.fromCharCode(j);
-var o50 = "";
-if (i50.replace(/\S+/g, "") !== o50) {
-  $ERROR("#50: Error matching character class \S between character c800 and cbff");
-}
-
-var i51 = "";
-for (var j = 0xCC00; j < 0xD000; j++)
-  i51 += String.fromCharCode(j);
-var o51 = "";
-if (i51.replace(/\S+/g, "") !== o51) {
-  $ERROR("#51: Error matching character class \S between character cc00 and cfff");
-}
-
-var i52 = "";
-for (var j = 0xD000; j < 0xD400; j++)
-  i52 += String.fromCharCode(j);
-var o52 = "";
-if (i52.replace(/\S+/g, "") !== o52) {
-  $ERROR("#52: Error matching character class \S between character d000 and d3ff");
-}
-
-var i53 = "";
-for (var j = 0xD400; j < 0xD800; j++)
-  i53 += String.fromCharCode(j);
-var o53 = "";
-if (i53.replace(/\S+/g, "") !== o53) {
-  $ERROR("#53: Error matching character class \S between character d400 and d7ff");
-}
-
-var i54 = "";
-for (var j = 0xD800; j < 0xDC00; j++)
-  i54 += String.fromCharCode(j);
-var o54 = "";
-if (i54.replace(/\S+/g, "") !== o54) {
-  $ERROR("#54: Error matching character class \S between character d800 and dbff");
-}
-
-var i55 = "";
-for (var j = 0xDC00; j < 0xE000; j++)
-  i55 += String.fromCharCode(j);
-var o55 = "";
-if (i55.replace(/\S+/g, "") !== o55) {
-  $ERROR("#55: Error matching character class \S between character dc00 and dfff");
-}
-
-var i56 = "";
-for (var j = 0xE000; j < 0xE400; j++)
-  i56 += String.fromCharCode(j);
-var o56 = "";
-if (i56.replace(/\S+/g, "") !== o56) {
-  $ERROR("#56: Error matching character class \S between character e000 and e3ff");
-}
-
-var i57 = "";
-for (var j = 0xE400; j < 0xE800; j++)
-  i57 += String.fromCharCode(j);
-var o57 = "";
-if (i57.replace(/\S+/g, "") !== o57) {
-  $ERROR("#57: Error matching character class \S between character e400 and e7ff");
-}
-
-var i58 = "";
-for (var j = 0xE800; j < 0xEC00; j++)
-  i58 += String.fromCharCode(j);
-var o58 = "";
-if (i58.replace(/\S+/g, "") !== o58) {
-  $ERROR("#58: Error matching character class \S between character e800 and ebff");
-}
-
-var i59 = "";
-for (var j = 0xEC00; j < 0xF000; j++)
-  i59 += String.fromCharCode(j);
-var o59 = "";
-if (i59.replace(/\S+/g, "") !== o59) {
-  $ERROR("#59: Error matching character class \S between character ec00 and efff");
-}
-
-var i60 = "";
-for (var j = 0xF000; j < 0xF400; j++)
-  i60 += String.fromCharCode(j);
-var o60 = "";
-if (i60.replace(/\S+/g, "") !== o60) {
-  $ERROR("#60: Error matching character class \S between character f000 and f3ff");
-}
-
-var i61 = "";
-for (var j = 0xF400; j < 0xF800; j++)
-  i61 += String.fromCharCode(j);
-var o61 = "";
-if (i61.replace(/\S+/g, "") !== o61) {
-  $ERROR("#61: Error matching character class \S between character f400 and f7ff");
-}
-
-var i62 = "";
-for (var j = 0xF800; j < 0xFC00; j++)
-  i62 += String.fromCharCode(j);
-var o62 = "";
-if (i62.replace(/\S+/g, "") !== o62) {
-  $ERROR("#62: Error matching character class \S between character f800 and fbff");
-}
-
-var i63 = "";
-for (var j = 0xFC00; j < 0x10000; j++) {
-  if (j === 0xFEFF) { continue; } //Ignore BOM
-  i63 += String.fromCharCode(j);
-}
-var o63 = "";
-if (i63.replace(/\S+/g, "") !== o63) {
-  $ERROR("#63: Error matching character class \S between character fc00 and ffff");
-}
-
-var i64 = String.fromCharCode(0xFEFF);
-if (i64.replace(/\S/g, "") === "") {
-  $ERROR("#64: Error matching character class \S for BOM (feff)");
-}
diff --git a/test/built-ins/RegExp/character-class-escape-non-whitespace-u180e.js b/test/built-ins/RegExp/character-class-escape-non-whitespace-u180e.js
new file mode 100644
index 0000000000..65777fda96
--- /dev/null
+++ b/test/built-ins/RegExp/character-class-escape-non-whitespace-u180e.js
@@ -0,0 +1,22 @@
+// Copyright 2018 Leonardo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-characterclassescape
+description: Detect non WhiteSpace using \S+
+info: |
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+
+    The Mongolian Vowel Separator (u180e) became a non whitespace character
+    since Unicode 6.3.0
+features: [u180e]
+---*/
+
+var str = String.fromCharCode(0x180E);
+assert.sameValue(
+  str.replace(/\S+/g, "test262"),
+  "test262",
+  "Non WhiteSpace character: \\u180E"
+);
diff --git a/test/built-ins/RegExp/character-class-escape-non-whitespace.js b/test/built-ins/RegExp/character-class-escape-non-whitespace.js
new file mode 100644
index 0000000000..2a8deecebf
--- /dev/null
+++ b/test/built-ins/RegExp/character-class-escape-non-whitespace.js
@@ -0,0 +1,55 @@
+// Copyright 2018 Leonardo Balter. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-characterclassescape
+description: Detect non WhiteSpace using \S+
+info: |
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+---*/
+
+var j;
+var i;
+var str;
+var res;
+
+var whitespaceChars = [
+  0x0009,
+  0x000A,
+  0x000B,
+  0x000C,
+  0x000D,
+  0x0020,
+  0x00A0,
+  0x1680,
+  0x2000,
+  0x2001,
+  0x2002,
+  0x2003,
+  0x2004,
+  0x2005,
+  0x2006,
+  0x2007,
+  0x2008,
+  0x2009,
+  0x200A,
+  0x2028,
+  0x2029,
+  0x202F,
+  0x205F,
+  0x3000,
+];
+
+for (j = 0x0000; j < 0x10000; j++) {
+  if (j === 0x180E) { continue; } // Skip 0x180E, current test in a separate file
+  if (j === 0xFEFF) { continue; } // Ignore BOM
+  str = String.fromCharCode(j);
+  res = str.replace(/\S+/g, "test262");
+  if (whitespaceChars.indexOf(j) >= 0) {
+    assert.sameValue(res, str, "WhiteSpace character, charCode: " + j);
+  } else {
+    assert.sameValue(res, "test262", "Non WhiteSpace character, charCode: " + j);
+  }
+}