diff --git a/test/language/comments/hashbang/encoded-bang-041.js b/test/language/comments/hashbang/encoded-bang-041.js
index cff31bccf7224eece62577a440306ff9a4ed3107..4051d172724e217ddd75b37a5bea7b913f9466d2 100644
--- a/test/language/comments/hashbang/encoded-bang-041.js
+++ b/test/language/comments/hashbang/encoded-bang-041.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-bang-u0021.js b/test/language/comments/hashbang/encoded-bang-u0021.js
index 6690038483907510ba97a194a4ed1672b608bcfb..b10c8a3e97d7c29e9b7f97b92749a347b8fd2ff3 100644
--- a/test/language/comments/hashbang/encoded-bang-u0021.js
+++ b/test/language/comments/hashbang/encoded-bang-u0021.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-bang-u21.js b/test/language/comments/hashbang/encoded-bang-u21.js
index 7257d5b9e89cc825a37e18612fe4ca707e7ac80c..d5bbb340c0bbaf95e8d7979c302162e1640302ab 100644
--- a/test/language/comments/hashbang/encoded-bang-u21.js
+++ b/test/language/comments/hashbang/encoded-bang-u21.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-bang-x21.js b/test/language/comments/hashbang/encoded-bang-x21.js
index 55dd11d7664f118741a7639a5c828a02f54592d8..4ddffcc2fab278c3669b09d75821a0ae4daa5cce 100644
--- a/test/language/comments/hashbang/encoded-bang-x21.js
+++ b/test/language/comments/hashbang/encoded-bang-x21.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-hash-043.js b/test/language/comments/hashbang/encoded-hash-043.js
index fa06d0a0d191c0f7ef882de4a250eb3fd888f178..1caefb3682589195f237acf2ea688471dd60a246 100644
--- a/test/language/comments/hashbang/encoded-hash-043.js
+++ b/test/language/comments/hashbang/encoded-hash-043.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-hash-u0023.js b/test/language/comments/hashbang/encoded-hash-u0023.js
index ac6c7c53e02714cbf280ae67f0201859c1f8c68e..41c337cfb8c72c340d3a5e714dfa6738f144dd38 100644
--- a/test/language/comments/hashbang/encoded-hash-u0023.js
+++ b/test/language/comments/hashbang/encoded-hash-u0023.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-hash-u23.js b/test/language/comments/hashbang/encoded-hash-u23.js
index 0a37c7679725f164f6c24b44bb36f1ebbea3bd1b..4ff6c89aa4554577f6d7d33946ee5e43848f638a 100644
--- a/test/language/comments/hashbang/encoded-hash-u23.js
+++ b/test/language/comments/hashbang/encoded-hash-u23.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-hash-x23.js b/test/language/comments/hashbang/encoded-hash-x23.js
index 2cc712547c22d0ee79ab363a2274a4b9103edd4e..da78beb2d4cb38057b818edd24b49e884de12183 100644
--- a/test/language/comments/hashbang/encoded-hash-x23.js
+++ b/test/language/comments/hashbang/encoded-hash-x23.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/encoded-hashbang.js b/test/language/comments/hashbang/encoded-hashbang.js
index be3e136976f0a4088ee8cc51b1c7325ff1ce6b92..493acd445bce0fc2318c70fcc51b36feccbb2d21 100644
--- a/test/language/comments/hashbang/encoded-hashbang.js
+++ b/test/language/comments/hashbang/encoded-hashbang.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/function-constructor.js b/test/language/comments/hashbang/function-constructor.js
index 1da390faea5633a963381bc5bbb69471be7e3bb4..fd87b6a6d626a8d017f90508ce84370110f58671 100644
--- a/test/language/comments/hashbang/function-constructor.js
+++ b/test/language/comments/hashbang/function-constructor.js
@@ -7,6 +7,7 @@ info: |
       #! SingleLineCommentChars[opt]
 features: [hashbang]
 ---*/
+
 const AsyncFunction = (async function (){}).constructor;
 const GeneratorFunction = (function *(){}).constructor;
 const AsyncGeneratorFunction = (async function *(){}).constructor;
diff --git a/test/language/comments/hashbang/module.js b/test/language/comments/hashbang/module.js
index 0cb52d718b18f397871c903e62283a71fd012023..d153305551c8d4f2cce7d0870f2ce2727429874e 100644
--- a/test/language/comments/hashbang/module.js
+++ b/test/language/comments/hashbang/module.js
@@ -6,6 +6,6 @@ description: >
 info: |
     HashbangComment::
       #! SingleLineCommentChars[opt]
-flags: [module]
+flags: [module, raw]
 features: [hashbang]
 ---*/
diff --git a/test/language/comments/hashbang/multi-line-comment.js b/test/language/comments/hashbang/multi-line-comment.js
index 04efe2147bc65007abe74df9fdac8c8aa59d03df..3e6c69cadbedb303916e7c949a5d794c0eae645a 100644
--- a/test/language/comments/hashbang/multi-line-comment.js
+++ b/test/language/comments/hashbang/multi-line-comment.js
@@ -1,5 +1,5 @@
 #!/*
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
 these characters should not be considered within a comment
 */
 /*---
@@ -14,4 +14,4 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
diff --git a/test/language/comments/hashbang/no-line-separator.js b/test/language/comments/hashbang/no-line-separator.js
index 79fbaaeea122a51f845bd86b793333cf40a5e4d4..2fd1778fd78f5d1e781b2ef1f652722ad6ca7cf0 100644
--- a/test/language/comments/hashbang/no-line-separator.js
+++ b/test/language/comments/hashbang/no-line-separator.js
@@ -5,7 +5,6 @@ description: >
 info: |
     HashbangComment::
       #! SingleLineCommentChars[opt]
-flags: [raw]
 features: [hashbang]
 ---*/
 
diff --git a/test/language/comments/hashbang/not-empty.js b/test/language/comments/hashbang/not-empty.js
index beebac4a570e4434c1289ca01e0fbe39cad44be9..ab03aed633b0210b6147bb724642841cca426c78 100644
--- a/test/language/comments/hashbang/not-empty.js
+++ b/test/language/comments/hashbang/not-empty.js
@@ -9,4 +9,3 @@ info: |
 flags: [raw]
 features: [hashbang]
 ---*/
-
diff --git a/test/language/comments/hashbang/preceding-directive-prologue-sc.js b/test/language/comments/hashbang/preceding-directive-prologue-sc.js
index a83a204f7f3baf7160a545504b08516ec77a4a0e..450aeec12414a60cc676fbc848e0d29a4d793f05 100644
--- a/test/language/comments/hashbang/preceding-directive-prologue-sc.js
+++ b/test/language/comments/hashbang/preceding-directive-prologue-sc.js
@@ -14,4 +14,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/preceding-directive-prologue.js b/test/language/comments/hashbang/preceding-directive-prologue.js
index 624a47816dc1f07981a4c1b43397e782b088770d..54e2f4123c1471cdcdf6f2e73146ddad3537d638 100644
--- a/test/language/comments/hashbang/preceding-directive-prologue.js
+++ b/test/language/comments/hashbang/preceding-directive-prologue.js
@@ -14,4 +14,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/preceding-empty-statement.js b/test/language/comments/hashbang/preceding-empty-statement.js
index 20d8479aa3c576ec13e91cf36ad0cc86863d394a..dc34617837287627601c8472b55dcd0181e2e9bc 100644
--- a/test/language/comments/hashbang/preceding-empty-statement.js
+++ b/test/language/comments/hashbang/preceding-empty-statement.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/preceding-hashbang.js b/test/language/comments/hashbang/preceding-hashbang.js
index fdfd26bd0840588645210efe18f5978db6707e70..61ee3f7d3a7250365d29fae38ea6bb4edfb82071 100644
--- a/test/language/comments/hashbang/preceding-hashbang.js
+++ b/test/language/comments/hashbang/preceding-hashbang.js
@@ -14,4 +14,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/preceding-line-comment.js b/test/language/comments/hashbang/preceding-line-comment.js
index 035ec3c9be50eb5e09e61d878ec5cf1f88a76587..1a54a7e8821f31255271653ef94ae1a0a3e58f63 100644
--- a/test/language/comments/hashbang/preceding-line-comment.js
+++ b/test/language/comments/hashbang/preceding-line-comment.js
@@ -14,4 +14,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/preceding-multi-line-comment.js b/test/language/comments/hashbang/preceding-multi-line-comment.js
index 228f0d3430ca05eebe97009e2000affcbbe166a2..1c44bbfd29d5533ef9d1c243ab24c7b72972ff9d 100644
--- a/test/language/comments/hashbang/preceding-multi-line-comment.js
+++ b/test/language/comments/hashbang/preceding-multi-line-comment.js
@@ -14,4 +14,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/preceding-whitespace.js b/test/language/comments/hashbang/preceding-whitespace.js
index 54797dffd5e8aebb6affaf352dc3e7d90309c5ee..3afb2f3c8d52484f84146b12c39f8ab18ac3ea95 100644
--- a/test/language/comments/hashbang/preceding-whitespace.js
+++ b/test/language/comments/hashbang/preceding-whitespace.js
@@ -13,4 +13,4 @@ negative:
 features: [hashbang]
 ---*/
 
-$DONOTEVALUATE();
+throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/comments/hashbang/statement-block.js b/test/language/comments/hashbang/statement-block.js
index f1d7647c89fc19d7bda09b9a923d2eb294c5dcb3..029ae1d98759f3f9d3ea52ecfb610f37144350fe 100644
--- a/test/language/comments/hashbang/statement-block.js
+++ b/test/language/comments/hashbang/statement-block.js
@@ -5,7 +5,6 @@ description: >
 info: |
     HashbangComment::
       #! SingleLineCommentChars[opt]
-flags: [raw]
 negative:
   phase: parse
   type: SyntaxError
@@ -16,4 +15,4 @@ $DONOTEVALUATE();
 
 {
   #!
-}
\ No newline at end of file
+}