diff --git a/src/parse/read/script.js b/src/parse/read/script.js
index 641a389804..2d1156ad7d 100644
--- a/src/parse/read/script.js
+++ b/src/parse/read/script.js
@@ -7,6 +7,8 @@ export default function readScript ( parser, start, attributes ) {
 	const scriptStart = parser.index;
 	const scriptEnd = parser.template.indexOf( scriptClosingTag, scriptStart );
 
+	if ( scriptEnd === -1 ) parser.error( `<script> must have a closing tag` );
+
 	const source = spaces( scriptStart ) + parser.template.slice( scriptStart, scriptEnd );
 	parser.index = scriptEnd + scriptClosingTag.length;
 
diff --git a/test/parser/index.js b/test/parser/index.js
index ed3f62368a..fb18cf1623 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -1,15 +1,16 @@
 import assert from 'assert';
 import * as fs from 'fs';
-import { svelte, exists } from '../helpers.js';
+import { svelte } from '../helpers.js';
 
 describe( 'parse', () => {
 	fs.readdirSync( 'test/parser/samples' ).forEach( dir => {
 		if ( dir[0] === '.' ) return;
 
-		const solo = exists( `test/parser/samples/${dir}/solo` );
+		// add .solo to a sample directory name to only run that test
+		const solo = /\.solo$/.test( dir );
 
 		if ( solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+			throw new Error( `Forgot to remove '.solo' from test parser/samples/${dir}` );
 		}
 
 		( solo ? it.only : it )( dir, () => {
diff --git a/test/parser/samples/error-script-unclosed/error.json b/test/parser/samples/error-script-unclosed/error.json
new file mode 100644
index 0000000000..fc928cabab
--- /dev/null
+++ b/test/parser/samples/error-script-unclosed/error.json
@@ -0,0 +1,8 @@
+{
+	"message": "<script> must have a closing tag",
+	"loc": {
+		"line": 3,
+		"column": 8
+	},
+	"pos": 34
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/input.html b/test/parser/samples/error-script-unclosed/input.html
new file mode 100644
index 0000000000..a3e9f0d0b9
--- /dev/null
+++ b/test/parser/samples/error-script-unclosed/input.html
@@ -0,0 +1,3 @@
+<h1>Hello {{name}}!</h1>
+
+<script>
\ No newline at end of file