diff --git a/test/parser/index.js b/test/parser/index.js
index 437bd152b6..1cf0bc29ab 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import { svelte, tryToLoadJson } from '../helpers.js';
 
-describe.only('parse', () => {
+describe('parse', () => {
 	fs.readdirSync('test/parser/samples').forEach(dir => {
 		if (dir[0] === '.') return;
 
diff --git a/test/preprocess/index.js b/test/preprocess/index.js
index d500db2016..51f1d168ce 100644
--- a/test/preprocess/index.js
+++ b/test/preprocess/index.js
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import { svelte } from '../helpers.js';
 
-describe.only('preprocess', () => {
+describe('preprocess', () => {
 	it('preprocesses entire component', () => {
 		const source = `
 			<h1>Hello __NAME__!</h1>
diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js
index f14c59a64d..7bdcaa7f41 100644
--- a/test/sourcemaps/index.js
+++ b/test/sourcemaps/index.js
@@ -5,7 +5,7 @@ import { loadConfig, svelte } from "../helpers.js";
 import { SourceMapConsumer } from "source-map";
 import { getLocator } from "locate-character";
 
-describe.only("sourcemaps", () => {
+describe("sourcemaps", () => {
 	fs.readdirSync("test/sourcemaps/samples").forEach(dir => {
 		if (dir[0] === ".") return;
 
diff --git a/test/validator/samples/computed-purity-check-no-this/errors.json b/test/validator/samples/computed-purity-check-no-this/errors.json
deleted file mode 100644
index fd0141a5c7..0000000000
--- a/test/validator/samples/computed-purity-check-no-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "impure-computed",
-	"message": "Computed properties should be pure functions — they do not have access to the component instance and cannot use 'this'. Did you mean to put this in 'methods'?",
-	"pos": 81,
-	"start": {
-		"line": 7,
-		"column": 4,
-		"character": 81
-	},
-	"end": {
-		"line": 7,
-		"column": 8,
-		"character": 85
-	}
-}]
diff --git a/test/validator/samples/computed-purity-check-no-this/input.html b/test/validator/samples/computed-purity-check-no-this/input.html
deleted file mode 100644
index d278e9e127..0000000000
--- a/test/validator/samples/computed-purity-check-no-this/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<button>{foo}</button>
-
-<script>
-	export default {
-		computed: {
-			foo () {
-				this.set({ foo: true });
-			}
-		}
-	}
-</script>
diff --git a/test/validator/samples/computed-purity-check-this-get/errors.json b/test/validator/samples/computed-purity-check-this-get/errors.json
deleted file mode 100644
index 24df2efddf..0000000000
--- a/test/validator/samples/computed-purity-check-this-get/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "impure-computed",
-	"message": "Cannot use this.get(...) — values must be passed into the function as arguments",
-	"pos": 71,
-	"start": {
-		"line": 7,
-		"column": 11,
-		"character": 71
-	},
-	"end": {
-		"line": 7,
-		"column": 28,
-		"character": 88
-	}
-}]
\ No newline at end of file
diff --git a/test/validator/samples/computed-purity-check-this-get/input.html b/test/validator/samples/computed-purity-check-this-get/input.html
deleted file mode 100644
index 5a16951645..0000000000
--- a/test/validator/samples/computed-purity-check-this-get/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{foo}
-
-<script>
-	export default {
-		computed: {
-			foo () {
-				return this.get( 'bar' );
-			}
-		}
-	}
-</script>
diff --git a/test/validator/samples/export-default-duplicated/errors.json b/test/validator/samples/export-default-duplicated/errors.json
deleted file mode 100644
index 232e833a01..0000000000
--- a/test/validator/samples/export-default-duplicated/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "parse-error",
-	"message": "Duplicate export 'default'",
-	"pos": 37,
-	"start": {
-		"line": 3,
-		"column": 8,
-		"character": 37
-	},
-	"end": {
-		"line": 3,
-		"column": 8,
-		"character": 37
-	}
-}]
diff --git a/test/validator/samples/export-default-duplicated/input.html b/test/validator/samples/export-default-duplicated/input.html
deleted file mode 100644
index adceb3dce5..0000000000
--- a/test/validator/samples/export-default-duplicated/input.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-	export default {};
-	export default {};
-</script>
diff --git a/test/validator/samples/export-default-must-be-object/errors.json b/test/validator/samples/export-default-must-be-object/errors.json
deleted file mode 100644
index a1171d5807..0000000000
--- a/test/validator/samples/export-default-must-be-object/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-default-export",
-	"message": "Default export must be an object literal",
-	"pos": 25,
-	"start": {
-		"line": 2,
-		"column": 16,
-		"character": 25
-	},
-	"end": {
-		"line": 2,
-		"column": 22,
-		"character": 31
-	}
-}]
diff --git a/test/validator/samples/export-default-must-be-object/input.html b/test/validator/samples/export-default-must-be-object/input.html
deleted file mode 100644
index 0451644c7b..0000000000
--- a/test/validator/samples/export-default-must-be-object/input.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-	export default potato;
-</script>
diff --git a/test/validator/samples/helper-purity-check-no-this/errors.json b/test/validator/samples/helper-purity-check-no-this/errors.json
deleted file mode 100644
index 549cd2f8c4..0000000000
--- a/test/validator/samples/helper-purity-check-no-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "impure-helper",
-	"message": "Helpers should be pure functions — they do not have access to the component instance and cannot use 'this'. Did you mean to put this in 'methods'?",
-	"pos": 95,
-	"start": {
-		"line": 7,
-		"column": 4,
-		"character": 95
-	},
-	"end": {
-		"line": 7,
-		"column": 8,
-		"character": 99
-	}
-}]
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-no-this/input.html b/test/validator/samples/helper-purity-check-no-this/input.html
deleted file mode 100644
index 795821b446..0000000000
--- a/test/validator/samples/helper-purity-check-no-this/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<button on:click='foo()'>foo</button>
-
-<script>
-	export default {
-		helpers: {
-			foo () {
-				this.set({ foo: true });
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-this-get/errors.json b/test/validator/samples/helper-purity-check-this-get/errors.json
deleted file mode 100644
index 09402d70ee..0000000000
--- a/test/validator/samples/helper-purity-check-this-get/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "impure-helper",
-	"message": "Cannot use this.get(...) — values must be passed into the helper function as arguments",
-	"pos": 72,
-	"start": {
-		"line": 7,
-		"column": 11,
-		"character": 72
-	},
-	"end": {
-		"line": 7,
-		"column": 28,
-		"character": 89
-	}
-}]
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-this-get/input.html b/test/validator/samples/helper-purity-check-this-get/input.html
deleted file mode 100644
index 7fdd1b61d1..0000000000
--- a/test/validator/samples/helper-purity-check-this-get/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{foo()}
-
-<script>
-	export default {
-		helpers: {
-			foo () {
-				return this.get( 'bar' );
-			}
-		}
-	}
-</script>
diff --git a/test/validator/samples/helper-purity-check-uses-arguments/input.html b/test/validator/samples/helper-purity-check-uses-arguments/input.html
deleted file mode 100644
index 0f7c690039..0000000000
--- a/test/validator/samples/helper-purity-check-uses-arguments/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	function sum() {
-		var total = '';
-		for ( var i = 0; i < arguments.length; i += 1 ) total += arguments[i];
-		return total;
-	}
-</script>
-
-{sum(1, 2, 3)}
\ No newline at end of file
diff --git a/test/validator/samples/helper-purity-check-uses-arguments/warnings.json b/test/validator/samples/helper-purity-check-uses-arguments/warnings.json
deleted file mode 100644
index 0637a088a0..0000000000
--- a/test/validator/samples/helper-purity-check-uses-arguments/warnings.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/test/validator/samples/method-arrow-no-this/errors.json b/test/validator/samples/method-arrow-no-this/errors.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/test/validator/samples/method-arrow-no-this/errors.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/test/validator/samples/method-arrow-no-this/input.html b/test/validator/samples/method-arrow-no-this/input.html
deleted file mode 100644
index 73349597f8..0000000000
--- a/test/validator/samples/method-arrow-no-this/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<button on:click='foo()'></button>
-
-<script>
-	export default {
-		methods: {
-			foo: () => console.log( 'foo' )
-		}
-	};
-</script>
diff --git a/test/validator/samples/method-arrow-this/errors.json b/test/validator/samples/method-arrow-this/errors.json
deleted file mode 100644
index 08a961405b..0000000000
--- a/test/validator/samples/method-arrow-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-method-value",
-	"message": "Method 'foo' should be a function expression, not an arrow function expression",
-	"pos": 79,
-	"start": {
-		"line": 6,
-		"column": 3,
-		"character": 79
-	},
-	"end": {
-		"line": 8,
-		"column": 4,
-		"character": 120
-	}
-}]
diff --git a/test/validator/samples/method-arrow-this/input.html b/test/validator/samples/method-arrow-this/input.html
deleted file mode 100644
index 2febe624f6..0000000000
--- a/test/validator/samples/method-arrow-this/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<button on:click='foo()'></button>
-
-<script>
-	export default {
-		methods: {
-			foo: () => {
-				this.set({ a: 1 });
-			}
-		}
-	};
-</script>
diff --git a/test/validator/samples/method-nonexistent-helper/input.html b/test/validator/samples/method-nonexistent-helper/input.html
deleted file mode 100644
index 20bb05b72c..0000000000
--- a/test/validator/samples/method-nonexistent-helper/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-	function bar() {
-		// ...
-	}
-
-	function foo(x) {
-		return x;
-	}
-</script>
-
-<button on:click='{foo}'></button>
diff --git a/test/validator/samples/method-nonexistent-helper/warnings.json b/test/validator/samples/method-nonexistent-helper/warnings.json
deleted file mode 100644
index 6b8049931e..0000000000
--- a/test/validator/samples/method-nonexistent-helper/warnings.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-	{
-		"code": "invalid-callee",
-		"message": "'foo' is an invalid callee (should be one of this.*, refs.*, event.*, options.*, console.*, set, fire, destroy or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
-		"pos": 18,
-		"start": {
-			"line": 1,
-			"column": 18,
-			"character": 18
-		},
-		"end": {
-			"line": 1,
-			"column": 23,
-			"character": 23
-		}
-	},
-	{
-		"code": "unused-helper",
-		"message": "The 'foo' helper is unused",
-		"start": {
-			"line": 12,
-			"column": 3,
-			"character": 126
-		},
-		"end": {
-			"line": 14,
-			"column": 4,
-			"character": 156
-		},
-		"pos": 126
-	}
-]
diff --git a/test/validator/samples/method-nonexistent/input.html b/test/validator/samples/method-nonexistent/input.html
deleted file mode 100644
index 8700637ce4..0000000000
--- a/test/validator/samples/method-nonexistent/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	function bar() {
-		// ...
-	}
-</script>
-
-<button on:click='{foo}'></button>
diff --git a/test/validator/samples/method-nonexistent/warnings.json b/test/validator/samples/method-nonexistent/warnings.json
deleted file mode 100644
index d0a30ab928..0000000000
--- a/test/validator/samples/method-nonexistent/warnings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-callee",
-	"message": "'foo' is an invalid callee (should be one of this.*, refs.*, event.*, options.*, console.*, set, fire, destroy or bar)",
-	"pos": 18,
-	"start": {
-		"line": 1,
-		"column": 18,
-		"character": 18
-	},
-	"end": {
-		"line": 1,
-		"column": 23,
-		"character": 23
-	}
-}]
diff --git a/test/validator/samples/method-quoted/errors.json b/test/validator/samples/method-quoted/errors.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/test/validator/samples/method-quoted/errors.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/test/validator/samples/method-quoted/input.html b/test/validator/samples/method-quoted/input.html
deleted file mode 100644
index 790276eebc..0000000000
--- a/test/validator/samples/method-quoted/input.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<button on:click='foo()'></button>
-
-<script>
-	export default {
-		methods: {
-			'foo': () => {},
-			'bar': () => {}
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-components/errors.json b/test/validator/samples/non-object-literal-components/errors.json
deleted file mode 100644
index 2cfa0a9b19..0000000000
--- a/test/validator/samples/non-object-literal-components/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-components-property",
-	"message": "The 'components' property must be an object literal",
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 3,
-		"column": 37,
-		"character": 64
-	},
-	"pos": 29
-}]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-components/input.html b/test/validator/samples/non-object-literal-components/input.html
deleted file mode 100644
index 1b863e97a9..0000000000
--- a/test/validator/samples/non-object-literal-components/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		components: 'not an object literal'
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-events/errors.json b/test/validator/samples/non-object-literal-events/errors.json
deleted file mode 100644
index be93ead597..0000000000
--- a/test/validator/samples/non-object-literal-events/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-events-property",
-	"message": "The 'events' property must be an object literal",
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 3,
-		"column": 33,
-		"character": 60
-	},
-	"pos": 29
-}]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-events/input.html b/test/validator/samples/non-object-literal-events/input.html
deleted file mode 100644
index 51f0940c17..0000000000
--- a/test/validator/samples/non-object-literal-events/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		events: 'not an object literal'
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-helpers/errors.json b/test/validator/samples/non-object-literal-helpers/errors.json
deleted file mode 100644
index 0fd7bf0b06..0000000000
--- a/test/validator/samples/non-object-literal-helpers/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-helpers-property",
-	"message": "The 'helpers' property must be an object literal",
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 3,
-		"column": 34,
-		"character": 61
-	},
-	"pos": 29
-}]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-helpers/input.html b/test/validator/samples/non-object-literal-helpers/input.html
deleted file mode 100644
index 196ffa2018..0000000000
--- a/test/validator/samples/non-object-literal-helpers/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		helpers: 'not an object literal'
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-methods/errors.json b/test/validator/samples/non-object-literal-methods/errors.json
deleted file mode 100644
index 84a42c6f94..0000000000
--- a/test/validator/samples/non-object-literal-methods/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-methods-property",
-	"message": "The 'methods' property must be an object literal",
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 3,
-		"column": 34,
-		"character": 61
-	},
-	"pos": 29
-}]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-methods/input.html b/test/validator/samples/non-object-literal-methods/input.html
deleted file mode 100644
index 662dce59ba..0000000000
--- a/test/validator/samples/non-object-literal-methods/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		methods: 'not an object literal'
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-transitions/errors.json b/test/validator/samples/non-object-literal-transitions/errors.json
deleted file mode 100644
index 9e4e04edb6..0000000000
--- a/test/validator/samples/non-object-literal-transitions/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-transitions-property",
-	"message": "The 'transitions' property must be an object literal",
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 3,
-		"column": 38,
-		"character": 65
-	},
-	"pos": 29
-}]
\ No newline at end of file
diff --git a/test/validator/samples/non-object-literal-transitions/input.html b/test/validator/samples/non-object-literal-transitions/input.html
deleted file mode 100644
index 3acd31fc0f..0000000000
--- a/test/validator/samples/non-object-literal-transitions/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		transitions: 'not an object literal'
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/oncreate-arrow-no-this/errors.json b/test/validator/samples/oncreate-arrow-no-this/errors.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/test/validator/samples/oncreate-arrow-no-this/errors.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/test/validator/samples/oncreate-arrow-no-this/input.html b/test/validator/samples/oncreate-arrow-no-this/input.html
deleted file mode 100644
index 21084bb4a6..0000000000
--- a/test/validator/samples/oncreate-arrow-no-this/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	import { onMount } from 'svelte';
-
-	onMount(() => console.log( 'rendering' ));
-</script>
diff --git a/test/validator/samples/oncreate-arrow-this/errors.json b/test/validator/samples/oncreate-arrow-this/errors.json
deleted file mode 100644
index b2a423e047..0000000000
--- a/test/validator/samples/oncreate-arrow-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-oncreate-property",
-	"message": "'oncreate' should be a function expression, not an arrow function expression",
-	"pos": 29,
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 5,
-		"column": 3,
-		"character": 73
-	}
-}]
diff --git a/test/validator/samples/oncreate-arrow-this/input.html b/test/validator/samples/oncreate-arrow-this/input.html
deleted file mode 100644
index 36d36b698d..0000000000
--- a/test/validator/samples/oncreate-arrow-this/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		oncreate: () => {
-			this.set({ a: 1 });
-		}
-	};
-</script>
diff --git a/test/validator/samples/ondestroy-arrow-no-this/errors.json b/test/validator/samples/ondestroy-arrow-no-this/errors.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/test/validator/samples/ondestroy-arrow-no-this/errors.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/test/validator/samples/ondestroy-arrow-no-this/input.html b/test/validator/samples/ondestroy-arrow-no-this/input.html
deleted file mode 100644
index ea9c367ee5..0000000000
--- a/test/validator/samples/ondestroy-arrow-no-this/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	import { onDestroy } from 'svelte';
-
-	onDestroy(() => console.log( 'tearing down' ));
-</script>
diff --git a/test/validator/samples/ondestroy-arrow-this/errors.json b/test/validator/samples/ondestroy-arrow-this/errors.json
deleted file mode 100644
index cb9eb915fd..0000000000
--- a/test/validator/samples/ondestroy-arrow-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-onDestroy-property",
-	"message": "'onDestroy' should be a function expression, not an arrow function expression",
-	"pos": 29,
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 5,
-		"column": 3,
-		"character": 74
-	}
-}]
diff --git a/test/validator/samples/ondestroy-arrow-this/input.html b/test/validator/samples/ondestroy-arrow-this/input.html
deleted file mode 100644
index 6529efe575..0000000000
--- a/test/validator/samples/ondestroy-arrow-this/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		onDestroy: () => {
-			this.set({ a: 1 });
-		}
-	};
-</script>
diff --git a/test/validator/samples/onstate-arrow-no-this/errors.json b/test/validator/samples/onstate-arrow-no-this/errors.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/test/validator/samples/onstate-arrow-no-this/errors.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/test/validator/samples/onstate-arrow-no-this/input.html b/test/validator/samples/onstate-arrow-no-this/input.html
deleted file mode 100644
index a4e3a162bd..0000000000
--- a/test/validator/samples/onstate-arrow-no-this/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	import { beforeUpdate } from 'svelte';
-
-	beforeUpdate(() => console.log('updating'));
-</script>
diff --git a/test/validator/samples/onstate-arrow-this/errors.json b/test/validator/samples/onstate-arrow-this/errors.json
deleted file mode 100644
index 3d9f5451d6..0000000000
--- a/test/validator/samples/onstate-arrow-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-onstate-property",
-	"message": "'onstate' should be a function expression, not an arrow function expression",
-	"pos": 29,
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 5,
-		"column": 3,
-		"character": 72
-	}
-}]
diff --git a/test/validator/samples/onstate-arrow-this/input.html b/test/validator/samples/onstate-arrow-this/input.html
deleted file mode 100644
index f0921ea81d..0000000000
--- a/test/validator/samples/onstate-arrow-this/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		onstate: () => {
-			this.set({ a: 1 });
-		}
-	};
-</script>
diff --git a/test/validator/samples/onupdate-arrow-no-this/errors.json b/test/validator/samples/onupdate-arrow-no-this/errors.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/test/validator/samples/onupdate-arrow-no-this/errors.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/test/validator/samples/onupdate-arrow-no-this/input.html b/test/validator/samples/onupdate-arrow-no-this/input.html
deleted file mode 100644
index 498b25da49..0000000000
--- a/test/validator/samples/onupdate-arrow-no-this/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	import { afterUpdate } from 'svelte';
-
-	afterUpdate(() => console.log('updating'));
-</script>
diff --git a/test/validator/samples/onupdate-arrow-this/errors.json b/test/validator/samples/onupdate-arrow-this/errors.json
deleted file mode 100644
index 9e598f33ae..0000000000
--- a/test/validator/samples/onupdate-arrow-this/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-afterUpdate-property",
-	"message": "'afterUpdate' should be a function expression, not an arrow function expression",
-	"pos": 29,
-	"start": {
-		"line": 3,
-		"column": 2,
-		"character": 29
-	},
-	"end": {
-		"line": 5,
-		"column": 3,
-		"character": 73
-	}
-}]
diff --git a/test/validator/samples/onupdate-arrow-this/input.html b/test/validator/samples/onupdate-arrow-this/input.html
deleted file mode 100644
index 2cdc2b3147..0000000000
--- a/test/validator/samples/onupdate-arrow-this/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		afterUpdate: () => {
-			this.set({ a: 1 });
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-components-must-be-capitalised/errors.json b/test/validator/samples/properties-components-must-be-capitalised/errors.json
deleted file mode 100644
index 3ceeea6f00..0000000000
--- a/test/validator/samples/properties-components-must-be-capitalised/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "component-lowercase",
-	"message": "Component names must be capitalised",
-	"start": {
-		"line": 6,
-		"column": 3,
-		"character": 59
-	},
-	"end": {
-		"line": 6,
-		"column": 6,
-		"character": 62
-	},
-	"pos": 59
-}]
diff --git a/test/validator/samples/properties-components-must-be-capitalised/input.html b/test/validator/samples/properties-components-must-be-capitalised/input.html
deleted file mode 100644
index 627a614cff..0000000000
--- a/test/validator/samples/properties-components-must-be-capitalised/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<foo></foo>
-
-<script>
-	export default {
-		components: {
-			foo
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-computed-cannot-be-reserved/errors.json b/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
deleted file mode 100644
index 8f771a57d6..0000000000
--- a/test/validator/samples/properties-computed-cannot-be-reserved/errors.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[{
-	"code": "invalid-computed-name",
-	"message":
-		"Computed property name 'new' is invalid — cannot be a JavaScript reserved word",
-	"start": {
-		"line": 9,
-		"column": 3,
-		"character": 87
-	},
-	"end": {
-		"line": 9,
-		"column": 6,
-		"character": 90
-	},
-	"pos": 87
-}]
diff --git a/test/validator/samples/properties-computed-cannot-be-reserved/input.html b/test/validator/samples/properties-computed-cannot-be-reserved/input.html
deleted file mode 100644
index 172456784d..0000000000
--- a/test/validator/samples/properties-computed-cannot-be-reserved/input.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-	export default {
-		data() {
-			return {
-				a: 1
-			};
-		},
-		computed: {
-			new: ({ a }) => a * 2
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-computed-must-be-an-object/errors.json b/test/validator/samples/properties-computed-must-be-an-object/errors.json
deleted file mode 100644
index b964b6b8bc..0000000000
--- a/test/validator/samples/properties-computed-must-be-an-object/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-computed-property",
-	"message": "The 'computed' property must be an object literal",
-	"start": {
-		"line": 5,
-		"column": 2,
-		"character": 42
-	},
-	"end": {
-		"line": 5,
-		"column": 23,
-		"character": 63
-	},
-	"pos": 42
-}]
diff --git a/test/validator/samples/properties-computed-must-be-an-object/input.html b/test/validator/samples/properties-computed-must-be-an-object/input.html
deleted file mode 100644
index 337fc3c386..0000000000
--- a/test/validator/samples/properties-computed-must-be-an-object/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		computed: notAnObject
-	};
-</script>
diff --git a/test/validator/samples/properties-computed-must-be-functions/errors.json b/test/validator/samples/properties-computed-must-be-functions/errors.json
deleted file mode 100644
index 40661ca5f3..0000000000
--- a/test/validator/samples/properties-computed-must-be-functions/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-computed-value",
-	"message": "Computed properties can be function expressions or arrow function expressions",
-	"start": {
-		"line": 6,
-		"column": 8,
-		"character": 62
-	},
-	"end": {
-		"line": 6,
-		"column": 20,
-		"character": 74
-	},
-	"pos": 62
-}]
diff --git a/test/validator/samples/properties-computed-must-be-functions/input.html b/test/validator/samples/properties-computed-must-be-functions/input.html
deleted file mode 100644
index bea71c86cd..0000000000
--- a/test/validator/samples/properties-computed-must-be-functions/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		computed: {
-			foo: notAFunction
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json b/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json
deleted file mode 100644
index d52061b79d..0000000000
--- a/test/validator/samples/properties-computed-must-be-valid-function-names/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-computed-name",
-	"message": "Computed property name 'with-hyphen' is invalid — must be a valid identifier such as with_hyphen",
-	"start": {
-		"line": 9,
-		"column": 3,
-		"character": 87
-	},
-	"end": {
-		"line": 9,
-		"column": 16,
-		"character": 100
-	},
-	"pos": 87
-}]
diff --git a/test/validator/samples/properties-computed-must-be-valid-function-names/input.html b/test/validator/samples/properties-computed-must-be-valid-function-names/input.html
deleted file mode 100644
index 35e2c598e0..0000000000
--- a/test/validator/samples/properties-computed-must-be-valid-function-names/input.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-	export default {
-		data() {
-			return {
-				a: 1
-			};
-		},
-		computed: {
-			"with-hyphen": ({ a }) => a * 2
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-computed-values-needs-arguments/errors.json b/test/validator/samples/properties-computed-values-needs-arguments/errors.json
deleted file mode 100644
index 6e91ecf32c..0000000000
--- a/test/validator/samples/properties-computed-values-needs-arguments/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "impure-computed",
-	"message": "A computed value must depend on at least one property",
-	"pos": 49,
-	"start": {
-		"line": 4,
-		"column": 8,
-		"character": 49
-	},
-	"end": {
-		"line": 4,
-		"column": 16,
-		"character": 57
-	}
-}]
\ No newline at end of file
diff --git a/test/validator/samples/properties-computed-values-needs-arguments/input.html b/test/validator/samples/properties-computed-values-needs-arguments/input.html
deleted file mode 100644
index 92cb29d732..0000000000
--- a/test/validator/samples/properties-computed-values-needs-arguments/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	export default {
-		computed: {
-			foo: () => {}
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-data-must-be-function/errors.json b/test/validator/samples/properties-data-must-be-function/errors.json
deleted file mode 100644
index d59826c49d..0000000000
--- a/test/validator/samples/properties-data-must-be-function/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-data-property",
-	"message": "'data' must be a function",
-	"start": {
-		"line": 5,
-		"column": 8,
-		"character": 48
-	},
-	"end": {
-		"line": 7,
-		"column": 3,
-		"character": 64
-	},
-	"pos": 48
-}]
diff --git a/test/validator/samples/properties-data-must-be-function/input.html b/test/validator/samples/properties-data-must-be-function/input.html
deleted file mode 100644
index 5b40b54cdc..0000000000
--- a/test/validator/samples/properties-data-must-be-function/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		data: {
-			foo: 42
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-duplicated/errors.json b/test/validator/samples/properties-duplicated/errors.json
deleted file mode 100644
index 08da6cc999..0000000000
--- a/test/validator/samples/properties-duplicated/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "duplicate-property",
-	"message": "Duplicate property 'methods'",
-	"start": {
-		"line": 9,
-		"column": 2,
-		"character": 74
-	},
-	"end": {
-		"line": 11,
-		"column": 3,
-		"character": 101
-	},
-	"pos": 74
-}]
diff --git a/test/validator/samples/properties-duplicated/input.html b/test/validator/samples/properties-duplicated/input.html
deleted file mode 100644
index 4945e8e320..0000000000
--- a/test/validator/samples/properties-duplicated/input.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		methods: {
-			foo () {}
-		},
-
-		methods: {
-			bar () {}
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-methods-getters-setters/errors.json b/test/validator/samples/properties-methods-getters-setters/errors.json
deleted file mode 100644
index d86fedc83c..0000000000
--- a/test/validator/samples/properties-methods-getters-setters/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "illegal-accessor",
-	"message": "Methods cannot use getters and setters",
-	"start": {
-		"line": 4,
-		"column": 3,
-		"character": 43
-	},
-	"end": {
-		"line": 6,
-		"column": 4,
-		"character": 61
-	},
-	"pos": 43
-}]
diff --git a/test/validator/samples/properties-methods-getters-setters/input.html b/test/validator/samples/properties-methods-getters-setters/input.html
deleted file mode 100644
index 1282aff074..0000000000
--- a/test/validator/samples/properties-methods-getters-setters/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	export default {
-		methods: {
-			get foo () {
-
-			}
-		}
-	};
-</script>
\ No newline at end of file
diff --git a/test/validator/samples/properties-props-must-be-an-array/errors.json b/test/validator/samples/properties-props-must-be-an-array/errors.json
deleted file mode 100644
index a9f30e3e05..0000000000
--- a/test/validator/samples/properties-props-must-be-an-array/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-props-property",
-	"message": "'props' must be an array expression, if specified",
-	"start": {
-		"line": 5,
-		"column": 9,
-		"character": 49
-	},
-	"end": {
-		"line": 5,
-		"column": 11,
-		"character": 51
-	},
-	"pos": 49
-}]
diff --git a/test/validator/samples/properties-props-must-be-an-array/input.html b/test/validator/samples/properties-props-must-be-an-array/input.html
deleted file mode 100644
index 8702707db2..0000000000
--- a/test/validator/samples/properties-props-must-be-an-array/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		props: {}
-	};
-</script>
diff --git a/test/validator/samples/properties-props-must-be-array-of-strings/errors.json b/test/validator/samples/properties-props-must-be-array-of-strings/errors.json
deleted file mode 100644
index 02117119d8..0000000000
--- a/test/validator/samples/properties-props-must-be-array-of-strings/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-props-property",
-	"message": "'props' must be an array of string literals",
-	"start": {
-		"line": 5,
-		"column": 10,
-		"character": 50
-	},
-	"end": {
-		"line": 5,
-		"column": 12,
-		"character": 52
-	},
-	"pos": 50
-}]
diff --git a/test/validator/samples/properties-props-must-be-array-of-strings/input.html b/test/validator/samples/properties-props-must-be-array-of-strings/input.html
deleted file mode 100644
index 3d1c0ba022..0000000000
--- a/test/validator/samples/properties-props-must-be-array-of-strings/input.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		props: [{}]
-	};
-</script>
diff --git a/test/validator/samples/properties-unexpected-b/errors.json b/test/validator/samples/properties-unexpected-b/errors.json
deleted file mode 100644
index aaa2c80cc7..0000000000
--- a/test/validator/samples/properties-unexpected-b/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "unexpected-property",
-	"message": "Unexpected property 'doSomething' (did you mean to include it in 'methods'?)",
-	"start": {
-		"line": 5,
-		"column": 2,
-		"character": 42
-	},
-	"end": {
-		"line": 7,
-		"column": 3,
-		"character": 81
-	},
-	"pos": 42
-}]
diff --git a/test/validator/samples/properties-unexpected-b/input.html b/test/validator/samples/properties-unexpected-b/input.html
deleted file mode 100644
index e666f4e2b1..0000000000
--- a/test/validator/samples/properties-unexpected-b/input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		doSomething () {
-			alert( 'boo' );
-		}
-	};
-</script>
diff --git a/test/validator/samples/properties-unexpected/errors.json b/test/validator/samples/properties-unexpected/errors.json
deleted file mode 100644
index 1ea3517e45..0000000000
--- a/test/validator/samples/properties-unexpected/errors.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "unexpected-property",
-	"message": "Unexpected property 'dada' (did you mean 'data'?)",
-	"start": {
-		"line": 5,
-		"column": 2,
-		"character": 42
-	},
-	"end": {
-		"line": 9,
-		"column": 3,
-		"character": 84
-	},
-	"pos": 42
-}]
diff --git a/test/validator/samples/properties-unexpected/input.html b/test/validator/samples/properties-unexpected/input.html
deleted file mode 100644
index 626e916993..0000000000
--- a/test/validator/samples/properties-unexpected/input.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div></div>
-
-<script>
-	export default {
-		dada () {
-			return {
-				foo: 42
-			}
-		}
-	};
-</script>
diff --git a/test/validator/samples/store-invalid-callee/input.html b/test/validator/samples/store-invalid-callee/input.html
deleted file mode 100644
index 2156f9e5ee..0000000000
--- a/test/validator/samples/store-invalid-callee/input.html
+++ /dev/null
@@ -1 +0,0 @@
-<button on:click="{() => store.set({ foo: 'bar' })}">click me</button>
\ No newline at end of file
diff --git a/test/validator/samples/store-invalid-callee/warnings.json b/test/validator/samples/store-invalid-callee/warnings.json
deleted file mode 100644
index 31e7982c71..0000000000
--- a/test/validator/samples/store-invalid-callee/warnings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
-	"code": "invalid-callee",
-	"message": "'store.set' is an invalid callee (did you mean '$set(...)'?)",
-	"pos": 18,
-	"start": {
-		"line": 1,
-		"column": 18,
-		"character": 18
-	},
-	"end": {
-		"line": 1,
-		"column": 43,
-		"character": 43
-	}
-}]
\ No newline at end of file