diff --git a/test/built-ins/RegExp/property-escapes/binary-properties-with-value.js b/test/built-ins/RegExp/property-escapes/binary-properties-with-value.js
deleted file mode 100644
index 346c79c08cf9e283dbead1e7a0b9c9393d7a05de..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/binary-properties-with-value.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Binary properties with an explicit value must throw in Unicode property
-  escapes (even if the value is valid).
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-assert.throws.early(SyntaxError, "/\\p{ASCII=Yes}/u");
-assert.throws.early(SyntaxError, "/\\p{ASCII=Y}/u");
-assert.throws.early(SyntaxError, "/\\p{ASCII=T}/u");
-
-assert.throws.early(SyntaxError, "/\\P{ASCII=No}/u");
-assert.throws.early(SyntaxError, "/\\P{ASCII=N}/u");
-assert.throws.early(SyntaxError, "/\\P{ASCII=F}/u");
-
-assert.throws.early(SyntaxError, "/\\p{ASCII=Invalid}/u");
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccbfcafebb1520cba19389260df1072c8695e16d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=F}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js
new file mode 100644
index 0000000000000000000000000000000000000000..ceb1879f703e510872998ba3fa5a4d4d433840d6
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=F}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..246350af0f04f07d563b683814c9ded0b718c72f
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=Invalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js
new file mode 100644
index 0000000000000000000000000000000000000000..fab653c84902526e6c9012b8a2797689e25c4d01
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=Invalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea73a2875e5b7c570ed0fe855ce9498ac9238370
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=N}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js
new file mode 100644
index 0000000000000000000000000000000000000000..56656dcc2451aa12c2d3151bb93debb51374c386
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=N}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..c14bb73614a7e792b80d36488455f43e7029b1bf
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=No}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js
new file mode 100644
index 0000000000000000000000000000000000000000..116ecd4675be78417c098412011522170ea098b8
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=No}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..63ed9e4f0ad59b7208f2bf75e9cee37b2b00680e
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=T}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js
new file mode 100644
index 0000000000000000000000000000000000000000..2889d2ae210bd0a5c2c4716b610d6e422f9fc250
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=T}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..a22ffb282ae5c7adac352b47616b182f726ed391
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=Y}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js
new file mode 100644
index 0000000000000000000000000000000000000000..688b32f21286528edd24746f25b0fcd7e4389344
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=Y}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..827ee53eafe01291667fd1575851cc64e3f58391
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASCII=Yes}/u;
diff --git a/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js
new file mode 100644
index 0000000000000000000000000000000000000000..cce1ad11806292ed47246665453fcf39c8254b76
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Binary properties with an explicit value must throw in Unicode property
+  escapes (even if the value is valid).
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASCII=Yes}/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-end.js b/test/built-ins/RegExp/property-escapes/character-class-range-end.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4d48612c338b03766421f932dc12bf81a129510
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-end.js
@@ -0,0 +1,20 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  NonemptyClassRanges :: ClassAtom - ClassAtom ClassRanges
+
+  It is a Syntax Error if IsCharacterClass of the first ClassAtom is
+  true or IsCharacterClass of the second ClassAtom is true.
+esid: sec-patterns-static-semantics-early-errors
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[--\p{Hex}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js
new file mode 100644
index 0000000000000000000000000000000000000000..b3bb456b33a1d96b79fcb1162e4108991dcb2eb0
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js
@@ -0,0 +1,20 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  NonemptyClassRangesNoDash :: ClassAtomNoDash - ClassAtom ClassRanges
+
+  It is a Syntax Error if IsCharacterClass of ClassAtomNoDash is true or
+  IsCharacterClass of ClassAtom is true.
+esid: sec-patterns-static-semantics-early-errors
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\uFFFF-\p{Hex}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef5fd20dc55209341ae73502f002e2c92b18ef67
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js
@@ -0,0 +1,20 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  NonemptyClassRangesNoDash :: ClassAtomNoDash - ClassAtom ClassRanges
+
+  It is a Syntax Error if IsCharacterClass of ClassAtomNoDash is true or
+  IsCharacterClass of ClassAtom is true.
+esid: sec-patterns-static-semantics-early-errors
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\p{Hex}-\uFFFF]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class-range-start.js b/test/built-ins/RegExp/property-escapes/character-class-range-start.js
new file mode 100644
index 0000000000000000000000000000000000000000..e03ee4de996c284a5396ab05af3210175b0600aa
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/character-class-range-start.js
@@ -0,0 +1,20 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  NonemptyClassRanges :: ClassAtom - ClassAtom ClassRanges
+
+  It is a Syntax Error if IsCharacterClass of the first ClassAtom is
+  true or IsCharacterClass of the second ClassAtom is true.
+esid: sec-patterns-static-semantics-early-errors
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\p{Hex}--]/u;
diff --git a/test/built-ins/RegExp/property-escapes/character-class.js b/test/built-ins/RegExp/property-escapes/character-class.js
index bb09e9c8186ddba071b6bf4c9ca2c92d1979e220..a1f09750fd243607e1371924a33c00a043af0f0e 100644
--- a/test/built-ins/RegExp/property-escapes/character-class.js
+++ b/test/built-ins/RegExp/property-escapes/character-class.js
@@ -1,4 +1,4 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
+// Copyright 2018 Mathias Bynens. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -10,17 +10,7 @@ features: [regexp-unicode-property-escapes]
 ---*/
 
 /[\p{Hex}]/u;
-assert.throws(
-  SyntaxError,
-  () => /[\p{Hex}-\uFFFF]/u,
-  // See step 1 of https://tc39.github.io/ecma262/#sec-runtime-semantics-characterrange-abstract-operation.
-  'property escape at start of character class range should throw if it expands to multiple characters'
-);
-assert.throws.early(SyntaxError, "/[\\p{}]/u");
-assert.throws.early(SyntaxError, "/[\\p{invalid}]/u");
-assert.throws.early(SyntaxError, "/[\\p{]/u");
-assert.throws.early(SyntaxError, "/[\\p{]}/u");
-assert.throws.early(SyntaxError, "/[\\p}]/u");
+
 assert(
   /[\p{Hex}\P{Hex}]/u.test('\u{1D306}'),
   'multiple property escapes in a single character class should be supported'
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..df640b339961c9fc40edab0df58f46607703dc69
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js
new file mode 100644
index 0000000000000000000000000000000000000000..1eb1a9972f74ebb571c61c21dc8579d241b4d132
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..df640b339961c9fc40edab0df58f46607703dc69
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js
new file mode 100644
index 0000000000000000000000000000000000000000..1eb1a9972f74ebb571c61c21dc8579d241b4d132
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{InAdlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..59fc7cb99a68da87180d0947e0dc3baadf1a492c
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{InScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js
new file mode 100644
index 0000000000000000000000000000000000000000..f575b0142787ae9211cb748d8419acb7694e3a10
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{InScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..48b95cba1d8450cabd55d29d309105eab0031310
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{IsScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c889e91712ae56d96355b0f4e5f69b3634f4858
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{IsScript=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b559675ee1b1cbd952db8575d057f30712b4634
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{^General_Category=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js
new file mode 100644
index 0000000000000000000000000000000000000000..b27561547b8aa2e5ef33bc0d86386855cc1dbc15
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{^General_Category=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..90d9f30c93aba1a0424c94c4672cb6a918d042be
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\p{}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js b/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js
new file mode 100644
index 0000000000000000000000000000000000000000..cfb1547268e40eeb8b374fd855054e9642f963f8
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-empty.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\P{}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec22be97d93ad61baf52ead4b34b1de7e26aad7e
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\P{invalid}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f6bcfb8fe145d99555bf46f713f4e5204d12da9
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-invalid.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/[\p{invalid}]/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..b660bdd133510f8b4d861730d5f5dcd14da8cacf
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..e66e9d00b014331bec8f4accf8c22253c31be04d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\PL/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js
new file mode 100644
index 0000000000000000000000000000000000000000..edaf3c3bdca661a8b24768603fa802be42258604
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\pL/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c287efb4a5ca6cb86955d899f39348d76de1811
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-no-braces.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4e847dc8f4ccab779d1651c905021f20f3182f9
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js
new file mode 100644
index 0000000000000000000000000000000000000000..c14455d269d8aefa60de3015a2759f1635f5513f
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{=Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..0672dabf7b071cdd501a7b2ad02f11be532c69fc
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{General_Category:Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a1a9db63c3be08ccd8892281a9d9d8abc60a5c6
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js
new file mode 100644
index 0000000000000000000000000000000000000000..84e155f01bec35fb63a662fb81f5bbf31868f6cb
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator-only.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js b/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c9051852a821986d14cfa6319141fa636409ca8
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-separator.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{General_Category:Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..7a91dca5e592be6063c4545d2dbab3c8fb8b43d2
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js
new file mode 100644
index 0000000000000000000000000000000000000000..db72f7c0152e6b90276d23aa4b61b19d915dd929
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unclosed.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..46eed4d31f711e4357aea60ed1b17f473b61035a
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js
new file mode 100644
index 0000000000000000000000000000000000000000..2791744e51e19e455046b67c64d630d9c49317fb
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/grammar-extension-unopened.js
@@ -0,0 +1,21 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  This tests violations of the grammar starting here:
+
+  CharacterClassEscape[U]::
+    [+U] p{ UnicodePropertyValueExpression }
+    [+U] P{ UnicodePropertyValueExpression }
+esid: prod-CharacterClassEscape
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p}/u;
diff --git a/test/built-ins/RegExp/property-escapes/grammar-extensions.js b/test/built-ins/RegExp/property-escapes/grammar-extensions.js
deleted file mode 100644
index 9e6c5582a886446867ff7c4d88813242831ecbe9..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/grammar-extensions.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Unicode property escapes must not support non-standard grammar extensions.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-/\p{General_Category=Letter}/u;
-/\P{General_Category=Letter}/u;
-assert.throws.early(SyntaxError, "/\\p{^General_Category=Letter}/u");
-assert.throws.early(SyntaxError, "/\\p{General_Category:Letter}/u");
-assert.throws.early(SyntaxError, "/\\P{General_Category:Letter}/u");
-/\p{Letter}/u;
-/\P{Letter}/u;
-assert.throws.early(SyntaxError, "/\\p{=Letter}/u");
-assert.throws.early(SyntaxError, "/\\P{=Letter}/u");
-assert.throws.early(SyntaxError, "/\\p{=}/u");
-assert.throws.early(SyntaxError, "/\\P{=}/u");
-/\p{L}/u;
-/\P{L}/u;
-assert.throws.early(SyntaxError, "/\\pL/u");
-assert.throws.early(SyntaxError, "/\\PL/u");
-
-// Note: `Adlam` is a valid property value for both `Script` and `Block`.
-/\p{Script=Adlam}/u;
-/\P{Script=Adlam}/u;
-assert.throws.early(SyntaxError, "/\\p{IsScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\P{IsScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\p{isScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\P{isScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\p{InScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\P{InScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\p{inScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\P{inScript=Adlam}/u");
-assert.throws.early(SyntaxError, "/\\p{InAdlam}/u");
-assert.throws.early(SyntaxError, "/\\P{InAdlam}/u");
-
-assert.throws.early(SyntaxError, "/\\p{/u");
-assert.throws.early(SyntaxError, "/\\P{/u");
-assert.throws.early(SyntaxError, "/\\p}/u");
-assert.throws.early(SyntaxError, "/\\P}/u");
-assert.throws.early(SyntaxError, "/\\p/u");
-assert.throws.early(SyntaxError, "/\\P/u");
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..deb36476d485499adb13dbfc238499efae2b43a8
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-01-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ General_Category=Uppercase_Letter }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-01.js b/test/built-ins/RegExp/property-escapes/loose-matching-01.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1a7f0a2e4613fd2acc752bdb8660c43538e1f57
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-01.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ General_Category=Uppercase_Letter }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ae1c47904976523899b43636d6a35515359cd49
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-02-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ Lowercase }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-02.js b/test/built-ins/RegExp/property-escapes/loose-matching-02.js
new file mode 100644
index 0000000000000000000000000000000000000000..f29b5ca7170d44305417b4cf0e3596459397ceac
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-02.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ Lowercase }/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..2565cc5b99794a2f1e08488ac63dc957632d197f
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-03-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ANY}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-03.js b/test/built-ins/RegExp/property-escapes/loose-matching-03.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b1f0247f448dfa39ee5d163740a0a645b55240f
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-03.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ANY}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff9fb3b2487212fb674009afc0af0381db0fa0b3
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-04-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ASSIGNED}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-04.js b/test/built-ins/RegExp/property-escapes/loose-matching-04.js
new file mode 100644
index 0000000000000000000000000000000000000000..2959ed27bb5da52d5e8c29ab07cfc7f8e619d226
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-04.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ASSIGNED}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..66d92c8b8618610b8925fb72ef66c31d7575e472
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-05-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-05.js b/test/built-ins/RegExp/property-escapes/loose-matching-05.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf9138e31a7e591d0f32a5641644f3b010bbe7b1
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-05.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbece88d101a777a6e2882a929cc493e85f260d1
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-06-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{General_Category = Uppercase_Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-06.js b/test/built-ins/RegExp/property-escapes/loose-matching-06.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fd0e521dccc835b23402839be66661512668cdd
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-06.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{General_Category = Uppercase_Letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..aee543413491e8529587073ccf0db363838830d7
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-07-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{_-_lOwEr_C-A_S-E_-_}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-07.js b/test/built-ins/RegExp/property-escapes/loose-matching-07.js
new file mode 100644
index 0000000000000000000000000000000000000000..abe0e9a966fd6089b591da0f77863a6daa16ba0d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-07.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{_-_lOwEr_C-A_S-E_-_}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..05e1890fa94cf351e1ebd3d0a82012bbfc5792b3
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-08-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{any}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-08.js b/test/built-ins/RegExp/property-escapes/loose-matching-08.js
new file mode 100644
index 0000000000000000000000000000000000000000..cbcd02c624f2a201ac82bc1389a6ab63abf418bb
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-08.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{any}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..02ba194a7de573f8d8908ab2716fcd963cd0274d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-09-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-09.js b/test/built-ins/RegExp/property-escapes/loose-matching-09.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fbdaf80e2fc1d578a50759b376d503b7b760d58
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-09.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{ascii}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..0083d34711fd135b012926f304e088d4f38d6ff0
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-10-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{assigned}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-10.js b/test/built-ins/RegExp/property-escapes/loose-matching-10.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a9d18025e6f01d6b515c45dd10e47b733e82de2
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-10.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{assigned}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..b85350d0eebc43378fb23d7efeb2cabb3bad37dc
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-11-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{gC=uppercase_letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-11.js b/test/built-ins/RegExp/property-escapes/loose-matching-11.js
new file mode 100644
index 0000000000000000000000000000000000000000..7da740b3c475c20ad9060dac3ec8aa999ac3548e
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-11.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{gC=uppercase_letter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..11741ffa19a5831d7e32b61fe3b84b6aa0b7441d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-12-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{gc=uppercaseletter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-12.js b/test/built-ins/RegExp/property-escapes/loose-matching-12.js
new file mode 100644
index 0000000000000000000000000000000000000000..15180fcdbabb428f3c5e5b768c1209d715f44d16
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-12.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{gc=uppercaseletter}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f8b7da7d6aeb989dc43bea66c9f7dfaf8edca1a
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-13-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-13.js b/test/built-ins/RegExp/property-escapes/loose-matching-13.js
new file mode 100644
index 0000000000000000000000000000000000000000..4293037c01baa7e7983d25c76791d0f8bbcb6603
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-13.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js b/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f8b7da7d6aeb989dc43bea66c9f7dfaf8edca1a
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-14-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching-14.js b/test/built-ins/RegExp/property-escapes/loose-matching-14.js
new file mode 100644
index 0000000000000000000000000000000000000000..4293037c01baa7e7983d25c76791d0f8bbcb6603
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/loose-matching-14.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Loose matching must not be applied when matching properties and values in
+  Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/loose-matching.js b/test/built-ins/RegExp/property-escapes/loose-matching.js
deleted file mode 100644
index ebd9c4e4cbb993b728824c348e3d1f508dfdec61..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/loose-matching.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Loose matching must not be applied when matching properties and values in
-  Unicode property escapes.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-/\p{Any}/u;
-assert.throws.early(SyntaxError, "/\\p{any}/u");
-assert.throws.early(SyntaxError, "/\\P{ANY}/u");
-
-/\p{ASCII}/u;
-assert.throws.early(SyntaxError, "/\\p{ascii}/u");
-assert.throws.early(SyntaxError, "/\\P{Ascii}/u");
-
-/\p{Assigned}/u;
-assert.throws.early(SyntaxError, "/\\p{assigned}/u");
-assert.throws.early(SyntaxError, "/\\P{ASSIGNED}/u");
-
-/\p{General_Category=Uppercase_Letter}/u;
-/\P{General_Category=Uppercase_Letter}/u;
-assert.throws.early(SyntaxError, "/\\p{General_Category = Uppercase_Letter}/u");
-assert.throws.early(SyntaxError, "/\\P{ General_Category=Uppercase_Letter }/u");
-assert.throws.early(SyntaxError, "/\\p{gc=uppercaseletter}/u");
-assert.throws.early(SyntaxError, "/\\P{gC=uppercase_letter}/u");
-
-/\p{Lowercase}/u;
-/\P{Lowercase}/u;
-assert.throws.early(SyntaxError, "/\\p{lowercase}/u");
-assert.throws.early(SyntaxError, "/\\p{ Lowercase }/u");
-assert.throws.early(SyntaxError, "/\\P{_-_lOwEr_C-A_S-E_-_}/u");
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-properties-without-value.js b/test/built-ins/RegExp/property-escapes/non-binary-properties-without-value.js
deleted file mode 100644
index 3804212eda4a19783cf37cee7716175e93680586..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/non-binary-properties-without-value.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Non-binary properties without a value must throw in Unicode property escapes.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-assert.throws.early(SyntaxError, "/\\p{General_Category}/u");
-assert.throws.early(SyntaxError, "/\\P{General_Category}/u");
-assert.throws.early(SyntaxError, "/\\p{General_Category=}/u");
-assert.throws.early(SyntaxError, "/\\P{General_Category=}/u");
-assert.throws.early(SyntaxError, "/\\p{Script}/u");
-assert.throws.early(SyntaxError, "/\\P{Script}/u");
-assert.throws.early(SyntaxError, "/\\p{Script=}/u");
-assert.throws.early(SyntaxError, "/\\P{Script=}/u");
-assert.throws.early(SyntaxError, "/\\p{Script_Extensions}/u");
-assert.throws.early(SyntaxError, "/\\P{Script_Extensions}/u");
-assert.throws.early(SyntaxError, "/\\p{Script_Extensions=}/u");
-assert.throws.early(SyntaxError, "/\\P{Script_Extensions=}/u");
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..faa9fa8bdc7f47a830f54551adf032be5e30fcea
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{General_Category=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js
new file mode 100644
index 0000000000000000000000000000000000000000..f36fb17081a2aeeaf29c7776b08d222c1f55c85f
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{General_Category=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad55a5dd74415c9e45d8714f96da97c474e66380
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{General_Category}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js
new file mode 100644
index 0000000000000000000000000000000000000000..39a6a9109d366f601e4c4aa89c1385dd5e58a39d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{General_Category}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..25131898fc2c4da53819a23ea5f866bdb211c663
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Script=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c21d041eed0965b65a28ef66c856b41176e5a82
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Script=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..430fb14d9d844e26ad8717717cb96815bd7648e8
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Script}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js
new file mode 100644
index 0000000000000000000000000000000000000000..b121607fb498089db80149a11044228f0ffedabb
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Script}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..7cb0a650d80d9f2350cdf0b61cba047d7b4cfdb1
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Script_Extensions=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js
new file mode 100644
index 0000000000000000000000000000000000000000..76f20b1bbf54f2e2d2a5e2a0e2de11887cbe10fa
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Script_Extensions=}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..60bf6d18ee89f0b1c02b9a0e3c0dee05107c8fbe
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Script_Extensions}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js
new file mode 100644
index 0000000000000000000000000000000000000000..77200ab05b92fa71a5d1cd55e6e4a1a113dd7d64
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-binary properties without a value must throw in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Script_Extensions}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ae47f46889c5bb800b540cc9a308f00f12a131a
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent properties must not be supported in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{UnknownBinaryProperty}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js b/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8ca1e7b6ef87caf617444b0ee31b861a72c995a
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-binary-property.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent properties must not be supported in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{UnknownBinaryProperty}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-properties.js b/test/built-ins/RegExp/property-escapes/non-existent-properties.js
deleted file mode 100644
index 86f39acb7cdf5c742e31b4566d14d06537ca8d08..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/non-existent-properties.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Non-existent properties must not be supported in Unicode property escapes.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-assert.throws.early(SyntaxError, "/\\p{UnknownBinaryProperty}/u");
-assert.throws.early(SyntaxError, "/\\P{UnknownBinaryProperty}/u");
-
-assert.throws.early(SyntaxError, "/\\p{Line_Breakz=Alphabetic}/u");
-assert.throws.early(SyntaxError, "/\\P{Line_Breakz=Alphabetic}/u");
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..063cecc3687e8a26b76fb2ff5082c91a4de382a7
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Line_Breakz=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js
new file mode 100644
index 0000000000000000000000000000000000000000..036b33af8e7e535ebfdd6cf711514900f295d261
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-and-value.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Line_Breakz=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbc5bf71fb1d4cae54c3cdf46db830ea64e60c7d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent properties must not be supported in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Line_Breakz=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js
new file mode 100644
index 0000000000000000000000000000000000000000..275a4ad0239060e2816fe169e79e959c0bd756e1
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-existing-value.js
@@ -0,0 +1,17 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent properties must not be supported in Unicode property escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Line_Breakz=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..5dd4d1d85acda543f5169abf4d0c21ad294503d0
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\\P{General_Category=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c43256f9553213b960f773048f1b541259b139d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\\P{Script=FooBarBazInvalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a621cd649ea4ae42bae049b80c3b038b703d7b5
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\\p{Script=FooBarBazInvalid}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..e6dfc721874171c7a28d2edd80f954257706c9fe
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\\P{Script_Extensions=H_e_h}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js
new file mode 100644
index 0000000000000000000000000000000000000000..48fb76d50c2384628724a1920df39d2618aea3be
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\\p{Script_Extensions=H_e_h}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js b/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js
new file mode 100644
index 0000000000000000000000000000000000000000..9acdfe28d2b5cd6f82c1e602c5af498bbcd6ba5e
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Non-existent property values must not be supported in Unicode property
+  escapes.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\\p{General_Category=WAT}/u;
diff --git a/test/built-ins/RegExp/property-escapes/non-existent-property-values.js b/test/built-ins/RegExp/property-escapes/non-existent-property-values.js
deleted file mode 100644
index aad28546ff9ab71b7bfcfeba8584af2e869a8189..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/non-existent-property-values.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Non-existent property values must not be supported in Unicode property
-  escapes.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-assert.throws.early(SyntaxError, "/\\p{General_Category=WAT}/u");
-assert.throws.early(SyntaxError, "/\\P{Line_Breakz=WAT}/u");
-
-assert.throws.early(SyntaxError, "/\\p{Script=FooBarBazInvalid}/u");
-assert.throws.early(SyntaxError, "/\\P{Script=FooBarBazInvalid}/u");
-
-assert.throws.early(SyntaxError, "/\\p{Script_Extensions=H_e_h}/u");
-assert.throws.early(SyntaxError, "/\\P{Script_Extensions=H_e_h}/u");
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-properties.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-properties.js
deleted file mode 100644
index 1bc42847ba7c17016d8de7ba33c9a256f3fc31b9..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/unsupported-binary-properties.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Some binary properties used to be part of the Unicode property escapes
-  proposal but were later removed. They must not be supported.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-assert.throws.early(SyntaxError, "/\\p{Composition_Exclusion}/u");
-assert.throws.early(SyntaxError, "/\\P{Composition_Exclusion}/u");
-assert.throws.early(SyntaxError, "/\\p{Expands_On_NFC}/u");
-assert.throws.early(SyntaxError, "/\\P{Expands_On_NFC}/u");
-assert.throws.early(SyntaxError, "/\\p{Expands_On_NFD}/u");
-assert.throws.early(SyntaxError, "/\\P{Expands_On_NFD}/u");
-assert.throws.early(SyntaxError, "/\\p{Expands_On_NFKC}/u");
-assert.throws.early(SyntaxError, "/\\P{Expands_On_NFKC}/u");
-assert.throws.early(SyntaxError, "/\\p{Expands_On_NFKD}/u");
-assert.throws.early(SyntaxError, "/\\P{Expands_On_NFKD}/u");
-assert.throws.early(SyntaxError, "/\\p{Extended_Pictographic}/u");
-assert.throws.early(SyntaxError, "/\\P{Extended_Pictographic}/u");
-assert.throws.early(SyntaxError, "/\\p{FC_NFKC_Closure}/u");
-assert.throws.early(SyntaxError, "/\\P{FC_NFKC_Closure}/u");
-assert.throws.early(SyntaxError, "/\\p{Full_Composition_Exclusion}/u");
-assert.throws.early(SyntaxError, "/\\P{Full_Composition_Exclusion}/u");
-assert.throws.early(SyntaxError, "/\\p{Grapheme_Link}/u");
-assert.throws.early(SyntaxError, "/\\P{Grapheme_Link}/u");
-assert.throws.early(SyntaxError, "/\\p{Hyphen}/u");
-assert.throws.early(SyntaxError, "/\\P{Hyphen}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_Alphabetic}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_Alphabetic}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_Default_Ignorable_Code_Point}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_Default_Ignorable_Code_Point}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_Grapheme_Extend}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_Grapheme_Extend}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_ID_Continue}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_ID_Continue}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_ID_Start}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_ID_Start}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_Lowercase}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_Lowercase}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_Math}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_Math}/u");
-assert.throws.early(SyntaxError, "/\\p{Other_Uppercase}/u");
-assert.throws.early(SyntaxError, "/\\P{Other_Uppercase}/u");
-assert.throws.early(SyntaxError, "/\\p{Prepended_Concatenation_Mark}/u");
-assert.throws.early(SyntaxError, "/\\P{Prepended_Concatenation_Mark}/u");
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..99e45692d05375ad60ae126624d353a8a8fb7a59
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ed3d596d12c6bcb57794fce2ffda6a26f16dce9
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f533590e1750daf5a636ad8a8c513daed434f21
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Expands_On_NFC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js
new file mode 100644
index 0000000000000000000000000000000000000000..c385fb52a502840276f9d4c6196908c3221ed4c7
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Expands_On_NFC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ab48cffda6d9d0e6cd42fa96920e2c9c9ac5c39
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Expands_On_NFD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js
new file mode 100644
index 0000000000000000000000000000000000000000..426e45890b2a5761ac8828bb9548ac063361fb4c
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Expands_On_NFD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..b00dba7b88fee96cc210776fb59559d46994e432
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Expands_On_NFKC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js
new file mode 100644
index 0000000000000000000000000000000000000000..c37c24659674e1c231fd1a66b87dd0c1533e9eda
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Expands_On_NFKC}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..b53043a71afd9ab3c0280dcc825497afceda211d
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Expands_On_NFKD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js
new file mode 100644
index 0000000000000000000000000000000000000000..97d2a16c287f29ca1b9cd47603ce40521eed2e14
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Expands_On_NFKD}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d8545ae621d2bece4c0f3bb06233e01d6470320
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6eef54861f3ada07d92249fea978ddcd5733236
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..1be13eff617bd9fa351c8acbfd7a82a70638580b
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Full_Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4c0648930b443b8749af6ef9adccc8cfc85a613
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Full_Composition_Exclusion}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..70e570811d9a19d9d7f0319b628f1fc51a905f20
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Grapheme_Link}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js
new file mode 100644
index 0000000000000000000000000000000000000000..1699ff37bc48848955ee033883135c79b434fa45
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Grapheme_Link}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..85af0ad93c1c1c35293f5cc29cb0ef6d15758f27
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Hyphen}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js
new file mode 100644
index 0000000000000000000000000000000000000000..1661ff0a93f994e2834c7f509d84db2ebde53046
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Hyphen}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf5f1bfb93a7bcec6b4e5ff31be64926ab15c301
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js
new file mode 100644
index 0000000000000000000000000000000000000000..40040e219ff0e2ae54be2c39ffd3b5b0ad507b82
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..6d4f4a08adc2f4714eb9b10059c949c99c8066ee
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_Default_Ignorable_Code_Point}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce183da1db18db3c4ac4c8838e8cd37820157734
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_Default_Ignorable_Code_Point}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..61429dfbdb02d2418467d3ed4d0a5079b3a341a9
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_Grapheme_Extend}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js
new file mode 100644
index 0000000000000000000000000000000000000000..e59fa88e841020840465a91d447a6e42c4a1c3b5
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_Grapheme_Extend}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..ece245eec2868e2bcfeda112db91597ab55349ca
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_ID_Continue}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js
new file mode 100644
index 0000000000000000000000000000000000000000..e6ef9f7a4d2f2bf8baff20dc3c3355a943195f30
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_ID_Continue}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d286655f3d4b299f4877d3244f29ed53d65176b
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_ID_Start}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a6d22d3249c53f494ca38e920b6cb3a7faf66fd
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_ID_Start}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..398316ac9f953198b84b90ee5a5a1ba2b66c5c9c
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_Lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js
new file mode 100644
index 0000000000000000000000000000000000000000..95d92095a6f77d74d860dd263878bd525bb73f67
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_Lowercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4cfada0fd502b8931e4e57b70f7851e191ce903
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_Math}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js
new file mode 100644
index 0000000000000000000000000000000000000000..507e5f3e7d0e9c163c0e5fdaa930c88d40262757
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_Math}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..c9738dc0555af79a7763a230a83e670ace16a4ff
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Other_Uppercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa90a7e9be4ecd337fa832290406161ede572bd5
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Other_Uppercase}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..c6b40da2fff63ecc858dbad56558c83fe4fd4771
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Prepended_Concatenation_Mark}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js
new file mode 100644
index 0000000000000000000000000000000000000000..23cd6a9e7a266f2da894b684f09c8e4421d52620
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Some binary properties used to be part of the Unicode property escapes
+  proposal but were later removed. They must not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Prepended_Concatenation_Mark}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-properties.js b/test/built-ins/RegExp/property-escapes/unsupported-properties.js
deleted file mode 100644
index efa85b1536f225b316cf1f9c885bb76811b29102..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/property-escapes/unsupported-properties.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 Mathias Bynens. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-author: Mathias Bynens
-description: >
-  Properties not explicitly listed in the Unicode property escapes spec must
-  not be supported.
-esid: sec-static-semantics-unicodematchproperty-p
-features: [regexp-unicode-property-escapes]
----*/
-
-// Non-existent binary properties must not be supported.
-assert.throws.early(SyntaxError, "/\\p{UnknownBinaryProperty}/u");
-assert.throws.early(SyntaxError, "/\\P{UnknownBinaryProperty}/u");
-
-// Unlisted properties must not be supported.
-assert.throws.early(SyntaxError, "/\\p{Line_Break}/u");
-assert.throws.early(SyntaxError, "/\\P{Line_Break}/u");
-assert.throws.early(SyntaxError, "/\\p{Line_Break=Alphabetic}/u");
-assert.throws.early(SyntaxError, "/\\P{Line_Break=Alphabetic}/u");
-assert.throws.early(SyntaxError, "/\\p{FC_NFKC_Closure}/u");
-assert.throws.early(SyntaxError, "/\\P{FC_NFKC_Closure}/u");
-assert.throws.early(SyntaxError, "/\\p{Block=Adlam}/u");
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..b72bd13b992c0f1619d67a74c13df76d6602e2cb
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Block=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js
new file mode 100644
index 0000000000000000000000000000000000000000..6eb17623555827b2f919979a93ceed60dbb77455
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Block=Adlam}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f8cb3f861878420f83ecab59c0990f07214bd88
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js
new file mode 100644
index 0000000000000000000000000000000000000000..ecec67ae58c7b5f3b5c46c4aac768edcbf7c30a3
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{FC_NFKC_Closure}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c4edf9f26915f84d42e21c345d47f0ad08ac4d7
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Line_Break=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c4edf9f26915f84d42e21c345d47f0ad08ac4d7
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\P{Line_Break=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js
new file mode 100644
index 0000000000000000000000000000000000000000..e404917ab23ae9c9ef199afc0e3371481ac05fa4
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Line_Break=Alphabetic}/u;
diff --git a/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js
new file mode 100644
index 0000000000000000000000000000000000000000..38d259eba50e836ce7e457ff6f9c8fc7221a4555
--- /dev/null
+++ b/test/built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js
@@ -0,0 +1,18 @@
+// Copyright 2018 Mathias Bynens. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+author: Mathias Bynens
+description: >
+  Properties not explicitly listed in the Unicode property escapes spec must
+  not be supported.
+esid: sec-static-semantics-unicodematchproperty-p
+negative:
+  phase: parse
+  type: SyntaxError
+features: [regexp-unicode-property-escapes]
+---*/
+
+throw "Test262: This statement should not be evaluated.";
+
+/\p{Line_Break}/u;