diff --git a/basic-tests/binary-property-with-value-ASCII_-_F-negated.js b/basic-tests/binary-property-with-value-ASCII_-_F-negated.js
index ccbfcafe..ef51f5fd 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_F-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_F-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=F}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_F.js b/basic-tests/binary-property-with-value-ASCII_-_F.js
index ceb1879f..1d098a2c 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_F.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_F.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=F}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_Invalid-negated.js b/basic-tests/binary-property-with-value-ASCII_-_Invalid-negated.js
index 246350af..3fe08460 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_Invalid-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_Invalid-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=Invalid}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_Invalid.js b/basic-tests/binary-property-with-value-ASCII_-_Invalid.js
index fab653c8..b4192a09 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_Invalid.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_Invalid.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=Invalid}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_N-negated.js b/basic-tests/binary-property-with-value-ASCII_-_N-negated.js
index ea73a287..8a78294b 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_N-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_N-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=N}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_N.js b/basic-tests/binary-property-with-value-ASCII_-_N.js
index 56656dcc..387ef857 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_N.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_N.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=N}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_No-negated.js b/basic-tests/binary-property-with-value-ASCII_-_No-negated.js
index c14bb736..d1bd9561 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_No-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_No-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=No}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_No.js b/basic-tests/binary-property-with-value-ASCII_-_No.js
index 116ecd46..7cd76920 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_No.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_No.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=No}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_T-negated.js b/basic-tests/binary-property-with-value-ASCII_-_T-negated.js
index 63ed9e4f..83b0f4b7 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_T-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_T-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=T}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_T.js b/basic-tests/binary-property-with-value-ASCII_-_T.js
index 2889d2ae..740bc2ed 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_T.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_T.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=T}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_Y-negated.js b/basic-tests/binary-property-with-value-ASCII_-_Y-negated.js
index a22ffb28..96fbf8ac 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_Y-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_Y-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=Y}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_Y.js b/basic-tests/binary-property-with-value-ASCII_-_Y.js
index 688b32f2..590a8a00 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_Y.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_Y.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=Y}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_Yes-negated.js b/basic-tests/binary-property-with-value-ASCII_-_Yes-negated.js
index 827ee53e..98d86d50 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_Yes-negated.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_Yes-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASCII=Yes}/u;
diff --git a/basic-tests/binary-property-with-value-ASCII_-_Yes.js b/basic-tests/binary-property-with-value-ASCII_-_Yes.js
index cce1ad11..2eb7dff6 100644
--- a/basic-tests/binary-property-with-value-ASCII_-_Yes.js
+++ b/basic-tests/binary-property-with-value-ASCII_-_Yes.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASCII=Yes}/u;
diff --git a/basic-tests/character-class-range-end.js b/basic-tests/character-class-range-end.js
index f4d48612..a7c400be 100644
--- a/basic-tests/character-class-range-end.js
+++ b/basic-tests/character-class-range-end.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[--\p{Hex}]/u;
diff --git a/basic-tests/character-class-range-no-dash-end.js b/basic-tests/character-class-range-no-dash-end.js
index b3bb456b..752dd360 100644
--- a/basic-tests/character-class-range-no-dash-end.js
+++ b/basic-tests/character-class-range-no-dash-end.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\uFFFF-\p{Hex}]/u;
diff --git a/basic-tests/character-class-range-no-dash-start.js b/basic-tests/character-class-range-no-dash-start.js
index ef5fd20d..db25cc8b 100644
--- a/basic-tests/character-class-range-no-dash-start.js
+++ b/basic-tests/character-class-range-no-dash-start.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\p{Hex}-\uFFFF]/u;
diff --git a/basic-tests/character-class-range-start.js b/basic-tests/character-class-range-start.js
index e03ee4de..dbe0a9e5 100644
--- a/basic-tests/character-class-range-start.js
+++ b/basic-tests/character-class-range-start.js
@@ -15,6 +15,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\p{Hex}--]/u;
diff --git a/basic-tests/grammar-extension-In-prefix-Block-implicit-negated.js b/basic-tests/grammar-extension-In-prefix-Block-implicit-negated.js
index df640b33..974f8111 100644
--- a/basic-tests/grammar-extension-In-prefix-Block-implicit-negated.js
+++ b/basic-tests/grammar-extension-In-prefix-Block-implicit-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{InAdlam}/u;
diff --git a/basic-tests/grammar-extension-In-prefix-Block-implicit.js b/basic-tests/grammar-extension-In-prefix-Block-implicit.js
index 1eb1a997..72397e68 100644
--- a/basic-tests/grammar-extension-In-prefix-Block-implicit.js
+++ b/basic-tests/grammar-extension-In-prefix-Block-implicit.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{InAdlam}/u;
diff --git a/basic-tests/grammar-extension-In-prefix-Script-implicit-negated.js b/basic-tests/grammar-extension-In-prefix-Script-implicit-negated.js
index df640b33..974f8111 100644
--- a/basic-tests/grammar-extension-In-prefix-Script-implicit-negated.js
+++ b/basic-tests/grammar-extension-In-prefix-Script-implicit-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{InAdlam}/u;
diff --git a/basic-tests/grammar-extension-In-prefix-Script-implicit.js b/basic-tests/grammar-extension-In-prefix-Script-implicit.js
index 1eb1a997..72397e68 100644
--- a/basic-tests/grammar-extension-In-prefix-Script-implicit.js
+++ b/basic-tests/grammar-extension-In-prefix-Script-implicit.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{InAdlam}/u;
diff --git a/basic-tests/grammar-extension-In-prefix-Script-negated.js b/basic-tests/grammar-extension-In-prefix-Script-negated.js
index 59fc7cb9..02ec4892 100644
--- a/basic-tests/grammar-extension-In-prefix-Script-negated.js
+++ b/basic-tests/grammar-extension-In-prefix-Script-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{InScript=Adlam}/u;
diff --git a/basic-tests/grammar-extension-In-prefix-Script.js b/basic-tests/grammar-extension-In-prefix-Script.js
index f575b014..c35fe6e9 100644
--- a/basic-tests/grammar-extension-In-prefix-Script.js
+++ b/basic-tests/grammar-extension-In-prefix-Script.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{InScript=Adlam}/u;
diff --git a/basic-tests/grammar-extension-Is-prefix-Script-negated.js b/basic-tests/grammar-extension-Is-prefix-Script-negated.js
index 48b95cba..661aa07f 100644
--- a/basic-tests/grammar-extension-Is-prefix-Script-negated.js
+++ b/basic-tests/grammar-extension-Is-prefix-Script-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{IsScript=Adlam}/u;
diff --git a/basic-tests/grammar-extension-Is-prefix-Script.js b/basic-tests/grammar-extension-Is-prefix-Script.js
index 3c889e91..41b74da2 100644
--- a/basic-tests/grammar-extension-Is-prefix-Script.js
+++ b/basic-tests/grammar-extension-Is-prefix-Script.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{IsScript=Adlam}/u;
diff --git a/basic-tests/grammar-extension-circumflex-negation-negated.js b/basic-tests/grammar-extension-circumflex-negation-negated.js
index 1b559675..662badac 100644
--- a/basic-tests/grammar-extension-circumflex-negation-negated.js
+++ b/basic-tests/grammar-extension-circumflex-negation-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{^General_Category=Letter}/u;
diff --git a/basic-tests/grammar-extension-circumflex-negation.js b/basic-tests/grammar-extension-circumflex-negation.js
index b2756154..31d5bf90 100644
--- a/basic-tests/grammar-extension-circumflex-negation.js
+++ b/basic-tests/grammar-extension-circumflex-negation.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{^General_Category=Letter}/u;
diff --git a/basic-tests/grammar-extension-empty-negated.js b/basic-tests/grammar-extension-empty-negated.js
index 90d9f30c..93e38c7b 100644
--- a/basic-tests/grammar-extension-empty-negated.js
+++ b/basic-tests/grammar-extension-empty-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\p{}]/u;
diff --git a/basic-tests/grammar-extension-empty.js b/basic-tests/grammar-extension-empty.js
index cfb15472..74d4db71 100644
--- a/basic-tests/grammar-extension-empty.js
+++ b/basic-tests/grammar-extension-empty.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\P{}]/u;
diff --git a/basic-tests/grammar-extension-invalid-negated.js b/basic-tests/grammar-extension-invalid-negated.js
index ec22be97..17236a56 100644
--- a/basic-tests/grammar-extension-invalid-negated.js
+++ b/basic-tests/grammar-extension-invalid-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\P{invalid}]/u;
diff --git a/basic-tests/grammar-extension-invalid.js b/basic-tests/grammar-extension-invalid.js
index 6f6bcfb8..70389b29 100644
--- a/basic-tests/grammar-extension-invalid.js
+++ b/basic-tests/grammar-extension-invalid.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /[\p{invalid}]/u;
diff --git a/basic-tests/grammar-extension-no-braces-negated.js b/basic-tests/grammar-extension-no-braces-negated.js
index b660bdd1..4a33a1ae 100644
--- a/basic-tests/grammar-extension-no-braces-negated.js
+++ b/basic-tests/grammar-extension-no-braces-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P/u;
diff --git a/basic-tests/grammar-extension-no-braces-value-negated.js b/basic-tests/grammar-extension-no-braces-value-negated.js
index e66e9d00..2c3e2017 100644
--- a/basic-tests/grammar-extension-no-braces-value-negated.js
+++ b/basic-tests/grammar-extension-no-braces-value-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\PL/u;
diff --git a/basic-tests/grammar-extension-no-braces-value.js b/basic-tests/grammar-extension-no-braces-value.js
index edaf3c3b..551e2373 100644
--- a/basic-tests/grammar-extension-no-braces-value.js
+++ b/basic-tests/grammar-extension-no-braces-value.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\pL/u;
diff --git a/basic-tests/grammar-extension-no-braces.js b/basic-tests/grammar-extension-no-braces.js
index 9c287efb..054e0a41 100644
--- a/basic-tests/grammar-extension-no-braces.js
+++ b/basic-tests/grammar-extension-no-braces.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p/u;
diff --git a/basic-tests/grammar-extension-separator-and-value-only-negated.js b/basic-tests/grammar-extension-separator-and-value-only-negated.js
index c4e847dc..6d6773ae 100644
--- a/basic-tests/grammar-extension-separator-and-value-only-negated.js
+++ b/basic-tests/grammar-extension-separator-and-value-only-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{=Letter}/u;
diff --git a/basic-tests/grammar-extension-separator-and-value-only.js b/basic-tests/grammar-extension-separator-and-value-only.js
index c14455d2..0386d03d 100644
--- a/basic-tests/grammar-extension-separator-and-value-only.js
+++ b/basic-tests/grammar-extension-separator-and-value-only.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{=Letter}/u;
diff --git a/basic-tests/grammar-extension-separator-negated.js b/basic-tests/grammar-extension-separator-negated.js
index 0672dabf..d567be4f 100644
--- a/basic-tests/grammar-extension-separator-negated.js
+++ b/basic-tests/grammar-extension-separator-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{General_Category:Letter}/u;
diff --git a/basic-tests/grammar-extension-separator-only-negated.js b/basic-tests/grammar-extension-separator-only-negated.js
index 1a1a9db6..71530768 100644
--- a/basic-tests/grammar-extension-separator-only-negated.js
+++ b/basic-tests/grammar-extension-separator-only-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{=}/u;
diff --git a/basic-tests/grammar-extension-separator-only.js b/basic-tests/grammar-extension-separator-only.js
index 84e155f0..2bbb08b8 100644
--- a/basic-tests/grammar-extension-separator-only.js
+++ b/basic-tests/grammar-extension-separator-only.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{=}/u;
diff --git a/basic-tests/grammar-extension-separator.js b/basic-tests/grammar-extension-separator.js
index 1c905185..b4f0eea2 100644
--- a/basic-tests/grammar-extension-separator.js
+++ b/basic-tests/grammar-extension-separator.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{General_Category:Letter}/u;
diff --git a/basic-tests/grammar-extension-unclosed-negated.js b/basic-tests/grammar-extension-unclosed-negated.js
index 7a91dca5..6404b156 100644
--- a/basic-tests/grammar-extension-unclosed-negated.js
+++ b/basic-tests/grammar-extension-unclosed-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{/u;
diff --git a/basic-tests/grammar-extension-unclosed.js b/basic-tests/grammar-extension-unclosed.js
index db72f7c0..9d0fbd81 100644
--- a/basic-tests/grammar-extension-unclosed.js
+++ b/basic-tests/grammar-extension-unclosed.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{/u;
diff --git a/basic-tests/grammar-extension-unopened-negated.js b/basic-tests/grammar-extension-unopened-negated.js
index 46eed4d3..c8a3d8b3 100644
--- a/basic-tests/grammar-extension-unopened-negated.js
+++ b/basic-tests/grammar-extension-unopened-negated.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P}/u;
diff --git a/basic-tests/grammar-extension-unopened.js b/basic-tests/grammar-extension-unopened.js
index 2791744e..1bea2dd0 100644
--- a/basic-tests/grammar-extension-unopened.js
+++ b/basic-tests/grammar-extension-unopened.js
@@ -16,6 +16,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p}/u;
diff --git a/basic-tests/loose-matching-01-negated.js b/basic-tests/loose-matching-01-negated.js
index deb36476..fa270c9d 100644
--- a/basic-tests/loose-matching-01-negated.js
+++ b/basic-tests/loose-matching-01-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ General_Category=Uppercase_Letter }/u;
diff --git a/basic-tests/loose-matching-01.js b/basic-tests/loose-matching-01.js
index a1a7f0a2..d46e8cdb 100644
--- a/basic-tests/loose-matching-01.js
+++ b/basic-tests/loose-matching-01.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ General_Category=Uppercase_Letter }/u;
diff --git a/basic-tests/loose-matching-02-negated.js b/basic-tests/loose-matching-02-negated.js
index 4ae1c479..210b7171 100644
--- a/basic-tests/loose-matching-02-negated.js
+++ b/basic-tests/loose-matching-02-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ Lowercase }/u;
diff --git a/basic-tests/loose-matching-02.js b/basic-tests/loose-matching-02.js
index f29b5ca7..2e079c11 100644
--- a/basic-tests/loose-matching-02.js
+++ b/basic-tests/loose-matching-02.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ Lowercase }/u;
diff --git a/basic-tests/loose-matching-03-negated.js b/basic-tests/loose-matching-03-negated.js
index 2565cc5b..072db718 100644
--- a/basic-tests/loose-matching-03-negated.js
+++ b/basic-tests/loose-matching-03-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ANY}/u;
diff --git a/basic-tests/loose-matching-03.js b/basic-tests/loose-matching-03.js
index 3b1f0247..3bca1424 100644
--- a/basic-tests/loose-matching-03.js
+++ b/basic-tests/loose-matching-03.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ANY}/u;
diff --git a/basic-tests/loose-matching-04-negated.js b/basic-tests/loose-matching-04-negated.js
index ff9fb3b2..508bb23d 100644
--- a/basic-tests/loose-matching-04-negated.js
+++ b/basic-tests/loose-matching-04-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ASSIGNED}/u;
diff --git a/basic-tests/loose-matching-04.js b/basic-tests/loose-matching-04.js
index 2959ed27..7b32ed24 100644
--- a/basic-tests/loose-matching-04.js
+++ b/basic-tests/loose-matching-04.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ASSIGNED}/u;
diff --git a/basic-tests/loose-matching-05-negated.js b/basic-tests/loose-matching-05-negated.js
index 66d92c8b..85425d89 100644
--- a/basic-tests/loose-matching-05-negated.js
+++ b/basic-tests/loose-matching-05-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Ascii}/u;
diff --git a/basic-tests/loose-matching-05.js b/basic-tests/loose-matching-05.js
index bf9138e3..ad8e0f52 100644
--- a/basic-tests/loose-matching-05.js
+++ b/basic-tests/loose-matching-05.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Ascii}/u;
diff --git a/basic-tests/loose-matching-06-negated.js b/basic-tests/loose-matching-06-negated.js
index dbece88d..ebd792c3 100644
--- a/basic-tests/loose-matching-06-negated.js
+++ b/basic-tests/loose-matching-06-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{General_Category = Uppercase_Letter}/u;
diff --git a/basic-tests/loose-matching-06.js b/basic-tests/loose-matching-06.js
index 7fd0e521..c17f1b9c 100644
--- a/basic-tests/loose-matching-06.js
+++ b/basic-tests/loose-matching-06.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{General_Category = Uppercase_Letter}/u;
diff --git a/basic-tests/loose-matching-07-negated.js b/basic-tests/loose-matching-07-negated.js
index aee54341..e6cb0af4 100644
--- a/basic-tests/loose-matching-07-negated.js
+++ b/basic-tests/loose-matching-07-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{_-_lOwEr_C-A_S-E_-_}/u;
diff --git a/basic-tests/loose-matching-07.js b/basic-tests/loose-matching-07.js
index abe0e9a9..ff53f295 100644
--- a/basic-tests/loose-matching-07.js
+++ b/basic-tests/loose-matching-07.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{_-_lOwEr_C-A_S-E_-_}/u;
diff --git a/basic-tests/loose-matching-08-negated.js b/basic-tests/loose-matching-08-negated.js
index 05e1890f..d63de284 100644
--- a/basic-tests/loose-matching-08-negated.js
+++ b/basic-tests/loose-matching-08-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{any}/u;
diff --git a/basic-tests/loose-matching-08.js b/basic-tests/loose-matching-08.js
index cbcd02c6..265123dc 100644
--- a/basic-tests/loose-matching-08.js
+++ b/basic-tests/loose-matching-08.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{any}/u;
diff --git a/basic-tests/loose-matching-09-negated.js b/basic-tests/loose-matching-09-negated.js
index 02ba194a..01b6461f 100644
--- a/basic-tests/loose-matching-09-negated.js
+++ b/basic-tests/loose-matching-09-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{ascii}/u;
diff --git a/basic-tests/loose-matching-09.js b/basic-tests/loose-matching-09.js
index 3fbdaf80..c6d9dd3a 100644
--- a/basic-tests/loose-matching-09.js
+++ b/basic-tests/loose-matching-09.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{ascii}/u;
diff --git a/basic-tests/loose-matching-10-negated.js b/basic-tests/loose-matching-10-negated.js
index 0083d347..5386ab70 100644
--- a/basic-tests/loose-matching-10-negated.js
+++ b/basic-tests/loose-matching-10-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{assigned}/u;
diff --git a/basic-tests/loose-matching-10.js b/basic-tests/loose-matching-10.js
index 1a9d1802..c92922fb 100644
--- a/basic-tests/loose-matching-10.js
+++ b/basic-tests/loose-matching-10.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{assigned}/u;
diff --git a/basic-tests/loose-matching-11-negated.js b/basic-tests/loose-matching-11-negated.js
index b85350d0..94eac819 100644
--- a/basic-tests/loose-matching-11-negated.js
+++ b/basic-tests/loose-matching-11-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{gC=uppercase_letter}/u;
diff --git a/basic-tests/loose-matching-11.js b/basic-tests/loose-matching-11.js
index 7da740b3..f153aae1 100644
--- a/basic-tests/loose-matching-11.js
+++ b/basic-tests/loose-matching-11.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{gC=uppercase_letter}/u;
diff --git a/basic-tests/loose-matching-12-negated.js b/basic-tests/loose-matching-12-negated.js
index 11741ffa..f942b99f 100644
--- a/basic-tests/loose-matching-12-negated.js
+++ b/basic-tests/loose-matching-12-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{gc=uppercaseletter}/u;
diff --git a/basic-tests/loose-matching-12.js b/basic-tests/loose-matching-12.js
index 15180fcd..63794552 100644
--- a/basic-tests/loose-matching-12.js
+++ b/basic-tests/loose-matching-12.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{gc=uppercaseletter}/u;
diff --git a/basic-tests/loose-matching-13-negated.js b/basic-tests/loose-matching-13-negated.js
index 9f8b7da7..45985d22 100644
--- a/basic-tests/loose-matching-13-negated.js
+++ b/basic-tests/loose-matching-13-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{lowercase}/u;
diff --git a/basic-tests/loose-matching-13.js b/basic-tests/loose-matching-13.js
index 4293037c..2c1f1349 100644
--- a/basic-tests/loose-matching-13.js
+++ b/basic-tests/loose-matching-13.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{lowercase}/u;
diff --git a/basic-tests/loose-matching-14-negated.js b/basic-tests/loose-matching-14-negated.js
index 9f8b7da7..45985d22 100644
--- a/basic-tests/loose-matching-14-negated.js
+++ b/basic-tests/loose-matching-14-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{lowercase}/u;
diff --git a/basic-tests/loose-matching-14.js b/basic-tests/loose-matching-14.js
index 4293037c..2c1f1349 100644
--- a/basic-tests/loose-matching-14.js
+++ b/basic-tests/loose-matching-14.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{lowercase}/u;
diff --git a/basic-tests/non-binary-property-without-value-General_Category-equals-negated.js b/basic-tests/non-binary-property-without-value-General_Category-equals-negated.js
index faa9fa8b..f8a48d8b 100644
--- a/basic-tests/non-binary-property-without-value-General_Category-equals-negated.js
+++ b/basic-tests/non-binary-property-without-value-General_Category-equals-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{General_Category=}/u;
diff --git a/basic-tests/non-binary-property-without-value-General_Category-equals.js b/basic-tests/non-binary-property-without-value-General_Category-equals.js
index f36fb170..22c8abea 100644
--- a/basic-tests/non-binary-property-without-value-General_Category-equals.js
+++ b/basic-tests/non-binary-property-without-value-General_Category-equals.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{General_Category=}/u;
diff --git a/basic-tests/non-binary-property-without-value-General_Category-negated.js b/basic-tests/non-binary-property-without-value-General_Category-negated.js
index ad55a5dd..7bb27099 100644
--- a/basic-tests/non-binary-property-without-value-General_Category-negated.js
+++ b/basic-tests/non-binary-property-without-value-General_Category-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{General_Category}/u;
diff --git a/basic-tests/non-binary-property-without-value-General_Category.js b/basic-tests/non-binary-property-without-value-General_Category.js
index 39a6a910..a7f6bd56 100644
--- a/basic-tests/non-binary-property-without-value-General_Category.js
+++ b/basic-tests/non-binary-property-without-value-General_Category.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{General_Category}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script-equals-negated.js b/basic-tests/non-binary-property-without-value-Script-equals-negated.js
index 25131898..194a451d 100644
--- a/basic-tests/non-binary-property-without-value-Script-equals-negated.js
+++ b/basic-tests/non-binary-property-without-value-Script-equals-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Script=}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script-equals.js b/basic-tests/non-binary-property-without-value-Script-equals.js
index 4c21d041..d600c265 100644
--- a/basic-tests/non-binary-property-without-value-Script-equals.js
+++ b/basic-tests/non-binary-property-without-value-Script-equals.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Script=}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script-negated.js b/basic-tests/non-binary-property-without-value-Script-negated.js
index 430fb14d..6b04000d 100644
--- a/basic-tests/non-binary-property-without-value-Script-negated.js
+++ b/basic-tests/non-binary-property-without-value-Script-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Script}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script.js b/basic-tests/non-binary-property-without-value-Script.js
index b121607f..8f5a3ac0 100644
--- a/basic-tests/non-binary-property-without-value-Script.js
+++ b/basic-tests/non-binary-property-without-value-Script.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Script}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script_Extensions-equals-negated.js b/basic-tests/non-binary-property-without-value-Script_Extensions-equals-negated.js
index 7cb0a650..3f57b277 100644
--- a/basic-tests/non-binary-property-without-value-Script_Extensions-equals-negated.js
+++ b/basic-tests/non-binary-property-without-value-Script_Extensions-equals-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Script_Extensions=}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script_Extensions-equals.js b/basic-tests/non-binary-property-without-value-Script_Extensions-equals.js
index 76f20b1b..2d7fe89c 100644
--- a/basic-tests/non-binary-property-without-value-Script_Extensions-equals.js
+++ b/basic-tests/non-binary-property-without-value-Script_Extensions-equals.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Script_Extensions=}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script_Extensions-negated.js b/basic-tests/non-binary-property-without-value-Script_Extensions-negated.js
index 60bf6d18..6351d4df 100644
--- a/basic-tests/non-binary-property-without-value-Script_Extensions-negated.js
+++ b/basic-tests/non-binary-property-without-value-Script_Extensions-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Script_Extensions}/u;
diff --git a/basic-tests/non-binary-property-without-value-Script_Extensions.js b/basic-tests/non-binary-property-without-value-Script_Extensions.js
index 77200ab0..fb67aa40 100644
--- a/basic-tests/non-binary-property-without-value-Script_Extensions.js
+++ b/basic-tests/non-binary-property-without-value-Script_Extensions.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Script_Extensions}/u;
diff --git a/basic-tests/non-existent-binary-property-negated.js b/basic-tests/non-existent-binary-property-negated.js
index 7ae47f46..e4863440 100644
--- a/basic-tests/non-existent-binary-property-negated.js
+++ b/basic-tests/non-existent-binary-property-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{UnknownBinaryProperty}/u;
diff --git a/basic-tests/non-existent-binary-property.js b/basic-tests/non-existent-binary-property.js
index e8ca1e7b..383dcafe 100644
--- a/basic-tests/non-existent-binary-property.js
+++ b/basic-tests/non-existent-binary-property.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{UnknownBinaryProperty}/u;
diff --git a/basic-tests/non-existent-property-and-value-negated.js b/basic-tests/non-existent-property-and-value-negated.js
index 063cecc3..90de6ce8 100644
--- a/basic-tests/non-existent-property-and-value-negated.js
+++ b/basic-tests/non-existent-property-and-value-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Line_Breakz=WAT}/u;
diff --git a/basic-tests/non-existent-property-and-value.js b/basic-tests/non-existent-property-and-value.js
index 036b33af..4e62aff7 100644
--- a/basic-tests/non-existent-property-and-value.js
+++ b/basic-tests/non-existent-property-and-value.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Line_Breakz=WAT}/u;
diff --git a/basic-tests/non-existent-property-existing-value-negated.js b/basic-tests/non-existent-property-existing-value-negated.js
index bbc5bf71..2346b017 100644
--- a/basic-tests/non-existent-property-existing-value-negated.js
+++ b/basic-tests/non-existent-property-existing-value-negated.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Line_Breakz=Alphabetic}/u;
diff --git a/basic-tests/non-existent-property-existing-value.js b/basic-tests/non-existent-property-existing-value.js
index 275a4ad0..8cf1ae61 100644
--- a/basic-tests/non-existent-property-existing-value.js
+++ b/basic-tests/non-existent-property-existing-value.js
@@ -12,6 +12,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Line_Breakz=Alphabetic}/u;
diff --git a/basic-tests/non-existent-property-value-General_Category-negated.js b/basic-tests/non-existent-property-value-General_Category-negated.js
index 5dd4d1d8..c4e27b8a 100644
--- a/basic-tests/non-existent-property-value-General_Category-negated.js
+++ b/basic-tests/non-existent-property-value-General_Category-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\\P{General_Category=WAT}/u;
diff --git a/basic-tests/non-existent-property-value-Script-negated.js b/basic-tests/non-existent-property-value-Script-negated.js
index 7c43256f..f32abaf2 100644
--- a/basic-tests/non-existent-property-value-Script-negated.js
+++ b/basic-tests/non-existent-property-value-Script-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\\P{Script=FooBarBazInvalid}/u;
diff --git a/basic-tests/non-existent-property-value-Script.js b/basic-tests/non-existent-property-value-Script.js
index 6a621cd6..7aa7a237 100644
--- a/basic-tests/non-existent-property-value-Script.js
+++ b/basic-tests/non-existent-property-value-Script.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\\p{Script=FooBarBazInvalid}/u;
diff --git a/basic-tests/non-existent-property-value-Script_Extensions-negated.js b/basic-tests/non-existent-property-value-Script_Extensions-negated.js
index e6dfc721..fdf63594 100644
--- a/basic-tests/non-existent-property-value-Script_Extensions-negated.js
+++ b/basic-tests/non-existent-property-value-Script_Extensions-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\\P{Script_Extensions=H_e_h}/u;
diff --git a/basic-tests/non-existent-property-value-Script_Extensions.js b/basic-tests/non-existent-property-value-Script_Extensions.js
index 48fb76d5..1576686a 100644
--- a/basic-tests/non-existent-property-value-Script_Extensions.js
+++ b/basic-tests/non-existent-property-value-Script_Extensions.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\\p{Script_Extensions=H_e_h}/u;
diff --git a/basic-tests/non-existent-property-value-general-category.js b/basic-tests/non-existent-property-value-general-category.js
index 9acdfe28..da522272 100644
--- a/basic-tests/non-existent-property-value-general-category.js
+++ b/basic-tests/non-existent-property-value-general-category.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\\p{General_Category=WAT}/u;
diff --git a/basic-tests/unsupported-binary-property-Composition_Exclusion-negated.js b/basic-tests/unsupported-binary-property-Composition_Exclusion-negated.js
index 99e45692..fce6713b 100644
--- a/basic-tests/unsupported-binary-property-Composition_Exclusion-negated.js
+++ b/basic-tests/unsupported-binary-property-Composition_Exclusion-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Composition_Exclusion}/u;
diff --git a/basic-tests/unsupported-binary-property-Composition_Exclusion.js b/basic-tests/unsupported-binary-property-Composition_Exclusion.js
index 9ed3d596..966edc60 100644
--- a/basic-tests/unsupported-binary-property-Composition_Exclusion.js
+++ b/basic-tests/unsupported-binary-property-Composition_Exclusion.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Composition_Exclusion}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFC-negated.js b/basic-tests/unsupported-binary-property-Expands_On_NFC-negated.js
index 3f533590..1c2375d4 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFC-negated.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFC-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFC}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFC.js b/basic-tests/unsupported-binary-property-Expands_On_NFC.js
index c385fb52..c75e454d 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFC.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFC.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFC}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFD-negated.js b/basic-tests/unsupported-binary-property-Expands_On_NFD-negated.js
index 4ab48cff..4a155fec 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFD-negated.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFD-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFD}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFD.js b/basic-tests/unsupported-binary-property-Expands_On_NFD.js
index 426e4589..2cefe3f0 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFD.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFD.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFD}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFKC-negated.js b/basic-tests/unsupported-binary-property-Expands_On_NFKC-negated.js
index b00dba7b..47aaa24c 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFKC-negated.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFKC-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFKC}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFKC.js b/basic-tests/unsupported-binary-property-Expands_On_NFKC.js
index c37c2465..022f42b1 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFKC.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFKC.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFKC}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFKD-negated.js b/basic-tests/unsupported-binary-property-Expands_On_NFKD-negated.js
index b53043a7..8b78249c 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFKD-negated.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFKD-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Expands_On_NFKD}/u;
diff --git a/basic-tests/unsupported-binary-property-Expands_On_NFKD.js b/basic-tests/unsupported-binary-property-Expands_On_NFKD.js
index 97d2a16c..0ea050d7 100644
--- a/basic-tests/unsupported-binary-property-Expands_On_NFKD.js
+++ b/basic-tests/unsupported-binary-property-Expands_On_NFKD.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Expands_On_NFKD}/u;
diff --git a/basic-tests/unsupported-binary-property-FC_NFKC_Closure-negated.js b/basic-tests/unsupported-binary-property-FC_NFKC_Closure-negated.js
index 7d8545ae..7280e112 100644
--- a/basic-tests/unsupported-binary-property-FC_NFKC_Closure-negated.js
+++ b/basic-tests/unsupported-binary-property-FC_NFKC_Closure-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{FC_NFKC_Closure}/u;
diff --git a/basic-tests/unsupported-binary-property-FC_NFKC_Closure.js b/basic-tests/unsupported-binary-property-FC_NFKC_Closure.js
index f6eef548..6a00c6d5 100644
--- a/basic-tests/unsupported-binary-property-FC_NFKC_Closure.js
+++ b/basic-tests/unsupported-binary-property-FC_NFKC_Closure.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{FC_NFKC_Closure}/u;
diff --git a/basic-tests/unsupported-binary-property-Full_Composition_Exclusion-negated.js b/basic-tests/unsupported-binary-property-Full_Composition_Exclusion-negated.js
index 1be13eff..3b90657d 100644
--- a/basic-tests/unsupported-binary-property-Full_Composition_Exclusion-negated.js
+++ b/basic-tests/unsupported-binary-property-Full_Composition_Exclusion-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Full_Composition_Exclusion}/u;
diff --git a/basic-tests/unsupported-binary-property-Full_Composition_Exclusion.js b/basic-tests/unsupported-binary-property-Full_Composition_Exclusion.js
index a4c06489..cf2eed3e 100644
--- a/basic-tests/unsupported-binary-property-Full_Composition_Exclusion.js
+++ b/basic-tests/unsupported-binary-property-Full_Composition_Exclusion.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Full_Composition_Exclusion}/u;
diff --git a/basic-tests/unsupported-binary-property-Grapheme_Link-negated.js b/basic-tests/unsupported-binary-property-Grapheme_Link-negated.js
index 70e57081..1caa0041 100644
--- a/basic-tests/unsupported-binary-property-Grapheme_Link-negated.js
+++ b/basic-tests/unsupported-binary-property-Grapheme_Link-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Grapheme_Link}/u;
diff --git a/basic-tests/unsupported-binary-property-Grapheme_Link.js b/basic-tests/unsupported-binary-property-Grapheme_Link.js
index 1699ff37..5bebfd71 100644
--- a/basic-tests/unsupported-binary-property-Grapheme_Link.js
+++ b/basic-tests/unsupported-binary-property-Grapheme_Link.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Grapheme_Link}/u;
diff --git a/basic-tests/unsupported-binary-property-Hyphen-negated.js b/basic-tests/unsupported-binary-property-Hyphen-negated.js
index 85af0ad9..5de6f5cb 100644
--- a/basic-tests/unsupported-binary-property-Hyphen-negated.js
+++ b/basic-tests/unsupported-binary-property-Hyphen-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Hyphen}/u;
diff --git a/basic-tests/unsupported-binary-property-Hyphen.js b/basic-tests/unsupported-binary-property-Hyphen.js
index 1661ff0a..4b9dfb76 100644
--- a/basic-tests/unsupported-binary-property-Hyphen.js
+++ b/basic-tests/unsupported-binary-property-Hyphen.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Hyphen}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Alphabetic-negated.js b/basic-tests/unsupported-binary-property-Other_Alphabetic-negated.js
index cf5f1bfb..fb547d1a 100644
--- a/basic-tests/unsupported-binary-property-Other_Alphabetic-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_Alphabetic-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_Alphabetic}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Alphabetic.js b/basic-tests/unsupported-binary-property-Other_Alphabetic.js
index 40040e21..fa1f8857 100644
--- a/basic-tests/unsupported-binary-property-Other_Alphabetic.js
+++ b/basic-tests/unsupported-binary-property-Other_Alphabetic.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_Alphabetic}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js b/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
index 6d4f4a08..74a741f7 100644
--- a/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_Default_Ignorable_Code_Point}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js b/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
index ce183da1..e826df17 100644
--- a/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
+++ b/basic-tests/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_Default_Ignorable_Code_Point}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Grapheme_Extend-negated.js b/basic-tests/unsupported-binary-property-Other_Grapheme_Extend-negated.js
index 61429dfb..2b54fc77 100644
--- a/basic-tests/unsupported-binary-property-Other_Grapheme_Extend-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_Grapheme_Extend-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_Grapheme_Extend}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Grapheme_Extend.js b/basic-tests/unsupported-binary-property-Other_Grapheme_Extend.js
index e59fa88e..9eebe00d 100644
--- a/basic-tests/unsupported-binary-property-Other_Grapheme_Extend.js
+++ b/basic-tests/unsupported-binary-property-Other_Grapheme_Extend.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_Grapheme_Extend}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_ID_Continue-negated.js b/basic-tests/unsupported-binary-property-Other_ID_Continue-negated.js
index ece245ee..6850867f 100644
--- a/basic-tests/unsupported-binary-property-Other_ID_Continue-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_ID_Continue-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_ID_Continue}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_ID_Continue.js b/basic-tests/unsupported-binary-property-Other_ID_Continue.js
index e6ef9f7a..00df819b 100644
--- a/basic-tests/unsupported-binary-property-Other_ID_Continue.js
+++ b/basic-tests/unsupported-binary-property-Other_ID_Continue.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_ID_Continue}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_ID_Start-negated.js b/basic-tests/unsupported-binary-property-Other_ID_Start-negated.js
index 9d286655..f33636b7 100644
--- a/basic-tests/unsupported-binary-property-Other_ID_Start-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_ID_Start-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_ID_Start}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_ID_Start.js b/basic-tests/unsupported-binary-property-Other_ID_Start.js
index 2a6d22d3..8f1497b2 100644
--- a/basic-tests/unsupported-binary-property-Other_ID_Start.js
+++ b/basic-tests/unsupported-binary-property-Other_ID_Start.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_ID_Start}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Lowercase-negated.js b/basic-tests/unsupported-binary-property-Other_Lowercase-negated.js
index 398316ac..33897f7a 100644
--- a/basic-tests/unsupported-binary-property-Other_Lowercase-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_Lowercase-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_Lowercase}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Lowercase.js b/basic-tests/unsupported-binary-property-Other_Lowercase.js
index 95d92095..ec16940b 100644
--- a/basic-tests/unsupported-binary-property-Other_Lowercase.js
+++ b/basic-tests/unsupported-binary-property-Other_Lowercase.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_Lowercase}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Math-negated.js b/basic-tests/unsupported-binary-property-Other_Math-negated.js
index a4cfada0..55ea1e62 100644
--- a/basic-tests/unsupported-binary-property-Other_Math-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_Math-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_Math}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Math.js b/basic-tests/unsupported-binary-property-Other_Math.js
index 507e5f3e..32f43014 100644
--- a/basic-tests/unsupported-binary-property-Other_Math.js
+++ b/basic-tests/unsupported-binary-property-Other_Math.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_Math}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Uppercase-negated.js b/basic-tests/unsupported-binary-property-Other_Uppercase-negated.js
index c9738dc0..173e114a 100644
--- a/basic-tests/unsupported-binary-property-Other_Uppercase-negated.js
+++ b/basic-tests/unsupported-binary-property-Other_Uppercase-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Other_Uppercase}/u;
diff --git a/basic-tests/unsupported-binary-property-Other_Uppercase.js b/basic-tests/unsupported-binary-property-Other_Uppercase.js
index fa90a7e9..4101f4de 100644
--- a/basic-tests/unsupported-binary-property-Other_Uppercase.js
+++ b/basic-tests/unsupported-binary-property-Other_Uppercase.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Other_Uppercase}/u;
diff --git a/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js b/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
index c6b40da2..8351ef85 100644
--- a/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
+++ b/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Prepended_Concatenation_Mark}/u;
diff --git a/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark.js b/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark.js
index 23cd6a9e..e39927bc 100644
--- a/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark.js
+++ b/basic-tests/unsupported-binary-property-Prepended_Concatenation_Mark.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Prepended_Concatenation_Mark}/u;
diff --git a/basic-tests/unsupported-property-Block-with-value-negated.js b/basic-tests/unsupported-property-Block-with-value-negated.js
index b72bd13b..4efc143b 100644
--- a/basic-tests/unsupported-property-Block-with-value-negated.js
+++ b/basic-tests/unsupported-property-Block-with-value-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Block=Adlam}/u;
diff --git a/basic-tests/unsupported-property-Block-with-value.js b/basic-tests/unsupported-property-Block-with-value.js
index 6eb17623..efe32f8f 100644
--- a/basic-tests/unsupported-property-Block-with-value.js
+++ b/basic-tests/unsupported-property-Block-with-value.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Block=Adlam}/u;
diff --git a/basic-tests/unsupported-property-FC_NFKC_Closure-negated.js b/basic-tests/unsupported-property-FC_NFKC_Closure-negated.js
index 6f8cb3f8..c0b38603 100644
--- a/basic-tests/unsupported-property-FC_NFKC_Closure-negated.js
+++ b/basic-tests/unsupported-property-FC_NFKC_Closure-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{FC_NFKC_Closure}/u;
diff --git a/basic-tests/unsupported-property-FC_NFKC_Closure.js b/basic-tests/unsupported-property-FC_NFKC_Closure.js
index ecec67ae..7cc1a19b 100644
--- a/basic-tests/unsupported-property-FC_NFKC_Closure.js
+++ b/basic-tests/unsupported-property-FC_NFKC_Closure.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{FC_NFKC_Closure}/u;
diff --git a/basic-tests/unsupported-property-Line_Break-negated.js b/basic-tests/unsupported-property-Line_Break-negated.js
index 4c4edf9f..426b17c9 100644
--- a/basic-tests/unsupported-property-Line_Break-negated.js
+++ b/basic-tests/unsupported-property-Line_Break-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Line_Break=Alphabetic}/u;
diff --git a/basic-tests/unsupported-property-Line_Break-with-value-negated.js b/basic-tests/unsupported-property-Line_Break-with-value-negated.js
index 4c4edf9f..426b17c9 100644
--- a/basic-tests/unsupported-property-Line_Break-with-value-negated.js
+++ b/basic-tests/unsupported-property-Line_Break-with-value-negated.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\P{Line_Break=Alphabetic}/u;
diff --git a/basic-tests/unsupported-property-Line_Break-with-value.js b/basic-tests/unsupported-property-Line_Break-with-value.js
index e404917a..fa565baf 100644
--- a/basic-tests/unsupported-property-Line_Break-with-value.js
+++ b/basic-tests/unsupported-property-Line_Break-with-value.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Line_Break=Alphabetic}/u;
diff --git a/basic-tests/unsupported-property-Line_Break.js b/basic-tests/unsupported-property-Line_Break.js
index 38d259eb..500a86c2 100644
--- a/basic-tests/unsupported-property-Line_Break.js
+++ b/basic-tests/unsupported-property-Line_Break.js
@@ -13,6 +13,6 @@ negative:
 features: [regexp-unicode-property-escapes]
 ---*/
 
-throw "Test262: This statement should not be evaluated.";
+$DONOTEVALUATE();
 
 /\p{Line_Break}/u;