diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-at-end.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-at-end.html
new file mode 100644
index 00000000..0df4a791
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-at-end.html
@@ -0,0 +1 @@
+abc
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-bang-comment.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-bang-comment.html.canonical
new file mode 100644
index 00000000..3dd48964
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-bang-comment.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+)head
+(body
+(script
+"
+)script
+"abc
+)body
+)HTML
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-closed-later.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-closed-later.html.canonical
index dcf57fe3..02264580 100644
--- a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-closed-later.html.canonical
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-closed-later.html.canonical
@@ -6,7 +6,12 @@
"\n
(script
Alanguage javascript
-"
+"
)script
"\n
)head
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-tag-in-code.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-tag-in-code.html
new file mode 100644
index 00000000..72166ef4
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-tag-in-code.html
@@ -0,0 +1 @@
+abc
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-tag-in-code.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-tag-in-code.html.canonical
new file mode 100644
index 00000000..91f6ad28
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment-tag-in-code.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+)head
+(body
+(script
+"
+)script
+"abc
+)body
+)HTML
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment.html
new file mode 100644
index 00000000..c5271995
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment.html
@@ -0,0 +1 @@
+abc
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment.html.canonical
new file mode 100644
index 00000000..f7ef7fa0
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-comment.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+)head
+(body
+(script
+"
+)script
+"abc
+)body
+)HTML
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-in-script.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-in-script.html
new file mode 100644
index 00000000..c065c12f
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-in-script.html
@@ -0,0 +1 @@
+OUTER
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-in-script.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-in-script.html.canonical
new file mode 100644
index 00000000..558aa8a3
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-in-script.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+(script
+"outerabc
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-bang-comment.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-bang-comment.html.canonical
new file mode 100644
index 00000000..2c584182
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-bang-comment.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+)head
+(body
+(script
+"console.log('a'); --!>
+)script
+"abc
+)body
+)HTML
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-comment.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-comment.html
new file mode 100644
index 00000000..5a42803c
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-comment.html
@@ -0,0 +1 @@
+abc
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-comment.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-comment.html.canonical
new file mode 100644
index 00000000..d4f8bf8a
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-only-close-comment.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+)head
+(body
+(script
+"console.log('a'); -->
+)script
+"abc
+)body
+)HTML
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-tag-in-code.html b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-tag-in-code.html
new file mode 100644
index 00000000..5c13aebb
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-tag-in-code.html
@@ -0,0 +1 @@
+');abc
\ No newline at end of file
diff --git a/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-tag-in-code.html.canonical b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-tag-in-code.html.canonical
new file mode 100644
index 00000000..afbeee48
--- /dev/null
+++ b/src/test/resources/org/htmlunit/cyberneko/testfiles/script/test-script-tag-in-code.html.canonical
@@ -0,0 +1,10 @@
+(HTML
+(head
+)head
+(body
+(script
+"console.log('