diff --git a/test/language/comments/hashbang/encoded-bang-041.js b/test/language/comments/hashbang/encoded-bang-041.js
index bfee27d968d5fd29cc3f2b814cd0438059dbaafe..cff31bccf7224eece62577a440306ff9a4ed3107 100644
--- a/test/language/comments/hashbang/encoded-bang-041.js
+++ b/test/language/comments/hashbang/encoded-bang-041.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-bang-u0021.js b/test/language/comments/hashbang/encoded-bang-u0021.js
index 6293923b5cda3ce6b10159d096c6011da3a08a23..6690038483907510ba97a194a4ed1672b608bcfb 100644
--- a/test/language/comments/hashbang/encoded-bang-u0021.js
+++ b/test/language/comments/hashbang/encoded-bang-u0021.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-bang-u21.js b/test/language/comments/hashbang/encoded-bang-u21.js
index fef8fec7ece4ce67c23d877015c841cd9b3a756f..7257d5b9e89cc825a37e18612fe4ca707e7ac80c 100644
--- a/test/language/comments/hashbang/encoded-bang-u21.js
+++ b/test/language/comments/hashbang/encoded-bang-u21.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-bang-x21.js b/test/language/comments/hashbang/encoded-bang-x21.js
index 4a64d3e55b26e9678636bc9535b6e17426eba47c..55dd11d7664f118741a7639a5c828a02f54592d8 100644
--- a/test/language/comments/hashbang/encoded-bang-x21.js
+++ b/test/language/comments/hashbang/encoded-bang-x21.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-hash-043.js b/test/language/comments/hashbang/encoded-hash-043.js
index f7a818a9c435155d71c5b9355bdb1a0a9759fcb6..fa06d0a0d191c0f7ef882de4a250eb3fd888f178 100644
--- a/test/language/comments/hashbang/encoded-hash-043.js
+++ b/test/language/comments/hashbang/encoded-hash-043.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-hash-u0023.js b/test/language/comments/hashbang/encoded-hash-u0023.js
index b771ebf5dd22437a5b0c66ba62d1857a416d25f8..ac6c7c53e02714cbf280ae67f0201859c1f8c68e 100644
--- a/test/language/comments/hashbang/encoded-hash-u0023.js
+++ b/test/language/comments/hashbang/encoded-hash-u0023.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-hash-u23.js b/test/language/comments/hashbang/encoded-hash-u23.js
index d0ccaa10c17570fdee70bc8d8b15b63baed14b11..0a37c7679725f164f6c24b44bb36f1ebbea3bd1b 100644
--- a/test/language/comments/hashbang/encoded-hash-u23.js
+++ b/test/language/comments/hashbang/encoded-hash-u23.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-hash-x23.js b/test/language/comments/hashbang/encoded-hash-x23.js
index dbf8c90ec5a8f545569d77206da2601b19948032..2cc712547c22d0ee79ab363a2274a4b9103edd4e 100644
--- a/test/language/comments/hashbang/encoded-hash-x23.js
+++ b/test/language/comments/hashbang/encoded-hash-x23.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/encoded-hashbang.js b/test/language/comments/hashbang/encoded-hashbang.js
index f09210fe646f103b3b9676a47e097e1495d79325..be3e136976f0a4088ee8cc51b1c7325ff1ce6b92 100644
--- a/test/language/comments/hashbang/encoded-hashbang.js
+++ b/test/language/comments/hashbang/encoded-hashbang.js
@@ -12,3 +12,5 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/function-body.js b/test/language/comments/hashbang/function-body.js
index 3c02a981e22305d7d0804fe3d878f1f1d756e693..9982ec09e2d5971da5daff1c806011114157c9fa 100644
--- a/test/language/comments/hashbang/function-body.js
+++ b/test/language/comments/hashbang/function-body.js
@@ -5,14 +5,13 @@ description: >
 info: |
     HashbangComment::
       #! SingleLineCommentChars[opt]
-flags: [raw]
 negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
 ---*/
 
-DONOTEVALUATE();
+$DONOTEVALUATE();
 
 function fn() {#!
 }
diff --git a/test/language/comments/hashbang/multi-line-comment.js b/test/language/comments/hashbang/multi-line-comment.js
index a4001b67c687e8473b8da59b01c757029ce86951..04efe2147bc65007abe74df9fdac8c8aa59d03df 100644
--- a/test/language/comments/hashbang/multi-line-comment.js
+++ b/test/language/comments/hashbang/multi-line-comment.js
@@ -1,5 +1,5 @@
 #!/*
-DONOTEVALUATE();
+$DONOTEVALUATE();
 these characters should not be considered within a comment
 */
 /*---
diff --git a/test/language/comments/hashbang/preceding-directive-prologue-sc.js b/test/language/comments/hashbang/preceding-directive-prologue-sc.js
index 29b624576fe9dd03eb0db011959b45837b910525..a83a204f7f3baf7160a545504b08516ec77a4a0e 100644
--- a/test/language/comments/hashbang/preceding-directive-prologue-sc.js
+++ b/test/language/comments/hashbang/preceding-directive-prologue-sc.js
@@ -12,4 +12,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/preceding-directive-prologue.js b/test/language/comments/hashbang/preceding-directive-prologue.js
index 3195624adcfc6a46d6c15153348341c95f312a70..624a47816dc1f07981a4c1b43397e782b088770d 100644
--- a/test/language/comments/hashbang/preceding-directive-prologue.js
+++ b/test/language/comments/hashbang/preceding-directive-prologue.js
@@ -12,4 +12,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/preceding-empty-statement.js b/test/language/comments/hashbang/preceding-empty-statement.js
index 188673fec0bdf465fc6c256fd82fe4790d0b7ef0..20d8479aa3c576ec13e91cf36ad0cc86863d394a 100644
--- a/test/language/comments/hashbang/preceding-empty-statement.js
+++ b/test/language/comments/hashbang/preceding-empty-statement.js
@@ -11,4 +11,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/preceding-hashbang.js b/test/language/comments/hashbang/preceding-hashbang.js
index 87915e80233f34de67efc38fe9219478e80f065c..fdfd26bd0840588645210efe18f5978db6707e70 100644
--- a/test/language/comments/hashbang/preceding-hashbang.js
+++ b/test/language/comments/hashbang/preceding-hashbang.js
@@ -12,4 +12,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/preceding-line-comment.js b/test/language/comments/hashbang/preceding-line-comment.js
index 6833e526256e33a4d1852172380542ba0a7cd24b..035ec3c9be50eb5e09e61d878ec5cf1f88a76587 100644
--- a/test/language/comments/hashbang/preceding-line-comment.js
+++ b/test/language/comments/hashbang/preceding-line-comment.js
@@ -12,4 +12,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/preceding-multi-line-comment.js b/test/language/comments/hashbang/preceding-multi-line-comment.js
index 5faa19b9d6c0200f44abe28d2793fd71fa7247c7..228f0d3430ca05eebe97009e2000affcbbe166a2 100644
--- a/test/language/comments/hashbang/preceding-multi-line-comment.js
+++ b/test/language/comments/hashbang/preceding-multi-line-comment.js
@@ -12,4 +12,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/preceding-whitespace.js b/test/language/comments/hashbang/preceding-whitespace.js
index bde162419ef50fedb93c035f00b2faa842384db0..54797dffd5e8aebb6affaf352dc3e7d90309c5ee 100644
--- a/test/language/comments/hashbang/preceding-whitespace.js
+++ b/test/language/comments/hashbang/preceding-whitespace.js
@@ -11,4 +11,6 @@ negative:
   phase: parse
   type: SyntaxError
 features: [hashbang]
----*/
\ No newline at end of file
+---*/
+
+$DONOTEVALUATE();
diff --git a/test/language/comments/hashbang/statement-block.js b/test/language/comments/hashbang/statement-block.js
index cf9272ce436cb44c5c3b96be2a4331a4a24725c5..f1d7647c89fc19d7bda09b9a923d2eb294c5dcb3 100644
--- a/test/language/comments/hashbang/statement-block.js
+++ b/test/language/comments/hashbang/statement-block.js
@@ -11,6 +11,9 @@ negative:
   type: SyntaxError
 features: [hashbang]
 ---*/
+
+$DONOTEVALUATE();
+
 {
   #!
 }
\ No newline at end of file
diff --git a/test/language/comments/hashbang/use-strict.js b/test/language/comments/hashbang/use-strict.js
index 6ccbf98bd8fce99dd38a4f6c4884f0386c94aabe..0c6ecdfbfd2ed777e2140b5593a97345b28160e4 100644
--- a/test/language/comments/hashbang/use-strict.js
+++ b/test/language/comments/hashbang/use-strict.js
@@ -6,7 +6,7 @@ description: >
 info: |
     HashbangComment::
       #! SingleLineCommentChars[opt]
-flags: [raw]
+flags: [raw, noStrict]
 features: [hashbang]
 ---*/