diff --git a/src/parse/index.ts b/src/parse/index.ts
index b7656a426a..9b3994c831 100644
--- a/src/parse/index.ts
+++ b/src/parse/index.ts
@@ -71,11 +71,19 @@ export class Parser {
 			const current = this.current();
 
 			const type = current.type === 'Element' ? `<${current.name}>` : 'Block';
-			this.error(`${type} was left open`, current.start);
+			const slug = current.type === 'Element' ? 'element' : 'block';
+
+			this.error({
+				code: `unclosed-${slug}`,
+				message: `${type} was left open`
+			}, current.start);
 		}
 
 		if (state !== fragment) {
-			this.error('Unexpected end of input');
+			this.error({
+				code: `unexpected-eof`,
+				message: 'Unexpected end of input'
+			});
 		}
 
 		if (this.html.children.length) {
@@ -97,12 +105,16 @@ export class Parser {
 	}
 
 	acornError(err: any) {
-		this.error(err.message.replace(/ \(\d+:\d+\)$/, ''), err.pos);
+		this.error({
+			code: `parse-error`,
+			message: err.message.replace(/ \(\d+:\d+\)$/, '')
+		}, err.pos);
 	}
 
-	error(message: string, index = this.index) {
+	error({ code, message }: { code: string, message: string }, index = this.index) {
 		error(message, {
 			name: 'ParseError',
+			code,
 			source: this.template,
 			start: index,
 			filename: this.filename
@@ -116,7 +128,10 @@ export class Parser {
 		}
 
 		if (required) {
-			this.error(message || `Expected ${str}`);
+			this.error({
+				code: `unexpected-${this.index === this.template.length ? 'eof' : 'token'}`,
+				message: message || `Expected ${str}`
+			});
 		}
 
 		return false;
@@ -164,7 +179,10 @@ export class Parser {
 		const identifier = this.template.slice(this.index, this.index = i);
 
 		if (reservedNames.has(identifier)) {
-			this.error(`'${identifier}' is a reserved word in JavaScript and cannot be used here`, start);
+			this.error({
+				code: `unexpected-reserved-word`,
+				message: `'${identifier}' is a reserved word in JavaScript and cannot be used here`
+			}, start);
 		}
 
 		return identifier;
@@ -172,7 +190,10 @@ export class Parser {
 
 	readUntil(pattern: RegExp) {
 		if (this.index >= this.template.length)
-			this.error('Unexpected end of input');
+			this.error({
+				code: `unexpected-eof`,
+				message: 'Unexpected end of input'
+			});
 
 		const start = this.index;
 		const match = pattern.exec(this.template.slice(start));
@@ -192,7 +213,10 @@ export class Parser {
 
 	requireWhitespace() {
 		if (!whitespace.test(this.template[this.index])) {
-			this.error(`Expected whitespace`);
+			this.error({
+				code: `missing-whitespace`,
+				message: `Expected whitespace`
+			});
 		}
 
 		this.allowWhitespace();
diff --git a/src/parse/read/directives.ts b/src/parse/read/directives.ts
index 77c0ffe47a..6d8fa70fc5 100644
--- a/src/parse/read/directives.ts
+++ b/src/parse/read/directives.ts
@@ -2,7 +2,19 @@ import { parseExpressionAt } from 'acorn';
 import repeat from '../../utils/repeat';
 import { Parser } from '../index';
 
-const DIRECTIVES = {
+const DIRECTIVES: Record<string, {
+	names: string[];
+	attribute: (
+		start: number,
+		end: number,
+		type: string,
+		name: string,
+		expression?: any,
+		directiveName?: string
+	) => { start: number, end: number, type: string, name: string, value?: any, expression?: any };
+	allowedExpressionTypes: string[];
+	error: string;
+}> = {
 	Ref: {
 		names: ['ref'],
 		attribute(start, end, type, name) {
@@ -143,7 +155,10 @@ export function readDirective(
 		try {
 			expression = readExpression(parser, expressionStart, quoteMark);
 			if (directive.allowedExpressionTypes.indexOf(expression.type) === -1) {
-				parser.error(directive.error, expressionStart);
+				parser.error({
+					code: `invalid-directive-value`,
+					message: directive.error
+				}, expressionStart);
 			}
 		} catch (err) {
 			if (parser.template[expressionStart] === '{') {
@@ -155,7 +170,10 @@ export function readDirective(
 					const value = parser.template.slice(expressionStart + (parser.v2 ? 1 : 2), expressionEnd);
 					message += ` — use '${value}', not '${parser.v2 ? `{${value}}` : `{{${value}}}`}'`;
 				}
-				parser.error(message, expressionStart);
+				parser.error({
+					code: `invalid-directive-value`,
+					message
+				}, expressionStart);
 			}
 
 			throw err;
diff --git a/src/parse/read/script.ts b/src/parse/read/script.ts
index 4f28200b43..0518bc51a6 100644
--- a/src/parse/read/script.ts
+++ b/src/parse/read/script.ts
@@ -12,7 +12,10 @@ export default function readScript(parser: Parser, start: number, attributes: No
 	const scriptStart = parser.index;
 	const scriptEnd = parser.template.indexOf(scriptClosingTag, scriptStart);
 
-	if (scriptEnd === -1) parser.error(`<script> must have a closing tag`);
+	if (scriptEnd === -1) parser.error({
+		code: `unclosed-script`,
+		message: `<script> must have a closing tag`
+	});
 
 	const source =
 		repeat(' ', scriptStart) + parser.template.slice(scriptStart, scriptEnd);
diff --git a/src/parse/read/style.ts b/src/parse/read/style.ts
index d8f40e9588..2cca2c425a 100644
--- a/src/parse/read/style.ts
+++ b/src/parse/read/style.ts
@@ -17,7 +17,10 @@ export default function readStyle(parser: Parser, start: number, attributes: Nod
 		});
 	} catch (err) {
 		if (err.name === 'CssSyntaxError') {
-			parser.error(err.message, err.offset);
+			parser.error({
+				code: `css-syntax-error`,
+				message: err.message
+			}, err.offset);
 		} else {
 			throw err;
 		}
diff --git a/src/parse/state/mustache.ts b/src/parse/state/mustache.ts
index 41762c2575..922de7b532 100644
--- a/src/parse/state/mustache.ts
+++ b/src/parse/state/mustache.ts
@@ -56,7 +56,10 @@ export default function mustache(parser: Parser) {
 		} else if (block.type === 'AwaitBlock') {
 			expected = 'await';
 		} else {
-			parser.error(`Unexpected block closing tag`);
+			parser.error({
+				code: `unexpected-block-close`,
+				message: `Unexpected block closing tag`
+			});
 		}
 
 		parser.eat(expected, true);
@@ -86,9 +89,10 @@ export default function mustache(parser: Parser) {
 	} else if (parser.eat(parser.v2 ? ':elseif' : 'elseif')) {
 		const block = parser.current();
 		if (block.type !== 'IfBlock')
-			parser.error(
-				'Cannot have an {{elseif ...}} block outside an {{#if ...}} block'
-			);
+			parser.error({
+				code: `invalid-elseif-placement`,
+				message: 'Cannot have an {{elseif ...}} block outside an {{#if ...}} block'
+			});
 
 		parser.requireWhitespace();
 
@@ -117,9 +121,10 @@ export default function mustache(parser: Parser) {
 	} else if (parser.eat(parser.v2 ? ':else' : 'else')) {
 		const block = parser.current();
 		if (block.type !== 'IfBlock' && block.type !== 'EachBlock') {
-			parser.error(
-				'Cannot have an {{else}} block outside an {{#if ...}} or {{#each ...}} block'
-			);
+			parser.error({
+				code: `invalid-else-placement`,
+				message: 'Cannot have an {{else}} block outside an {{#if ...}} or {{#each ...}} block'
+			});
 		}
 
 		parser.allowWhitespace();
@@ -191,7 +196,10 @@ export default function mustache(parser: Parser) {
 		} else if (parser.eat('await')) {
 			type = 'AwaitBlock';
 		} else {
-			parser.error(`Expected if, each or await`);
+			parser.error({
+				code: `expected-block-type`,
+				message: `Expected if, each or await`
+			});
 		}
 
 		parser.requireWhitespace();
@@ -249,20 +257,30 @@ export default function mustache(parser: Parser) {
 					parser.allowWhitespace();
 
 					const destructuredContext = parser.readIdentifier();
-					if (!destructuredContext) parser.error(`Expected name`);
+					if (!destructuredContext) parser.error({
+						code: `expected-name`,
+						message: `Expected name`
+					});
 
 					block.destructuredContexts.push(destructuredContext);
 					parser.allowWhitespace();
 				} while (parser.eat(','));
 
-				if (!block.destructuredContexts.length) parser.error(`Expected name`);
+				if (!block.destructuredContexts.length) parser.error({
+					code: `expected-name`,
+					message: `Expected name`
+				});
+
 				block.context = block.destructuredContexts.join('_');
 
 				parser.allowWhitespace();
 				parser.eat(']', true);
 			} else {
 				block.context = parser.readIdentifier();
-				if (!block.context) parser.error(`Expected name`);
+				if (!block.context) parser.error({
+					code: `expected-name`,
+					message: `Expected name`
+				});
 			}
 
 			parser.allowWhitespace();
@@ -270,7 +288,11 @@ export default function mustache(parser: Parser) {
 			if (parser.eat(',')) {
 				parser.allowWhitespace();
 				block.index = parser.readIdentifier();
-				if (!block.index) parser.error(`Expected name`);
+				if (!block.index) parser.error({
+					code: `expected-name`,
+					message: `Expected name`
+				});
+
 				parser.allowWhitespace();
 			}
 
@@ -287,7 +309,10 @@ export default function mustache(parser: Parser) {
 					expression.property.computed ||
 					expression.property.type !== 'Identifier'
 				) {
-					parser.error('invalid key', expression.start);
+					parser.error({
+						code: `invalid-key`,
+						message: 'invalid key'
+					}, expression.start);
 				}
 
 				block.key = expression.property.name;
@@ -296,7 +321,10 @@ export default function mustache(parser: Parser) {
 				parser.allowWhitespace();
 			} else if (parser.eat('@')) {
 				block.key = parser.readIdentifier();
-				if (!block.key) parser.error(`Expected name`);
+				if (!block.key) parser.error({
+					code: `expected-name`,
+					message: `Expected name`
+				});
 				parser.allowWhitespace();
 			}
 		}
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index dad44f81fe..7274ced6c6 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -83,21 +83,27 @@ export default function tag(parser: Parser) {
 	const name = readTagName(parser);
 
 	if (metaTags.has(name)) {
+		const slug = metaTags.get(name).toLowerCase();
 		if (isClosingTag) {
 			if ((name === ':Window' || name === 'svelte:window') && parser.current().children.length) {
-				parser.error(
-					`<${name}> cannot have children`,
-					parser.current().children[0].start
-				);
+				parser.error({
+					code: `invalid-window-content`,
+					message: `<${name}> cannot have children`
+				}, parser.current().children[0].start);
 			}
 		} else {
 			if (name in parser.metaTags) {
-				parser.error(`A component can only have one <${name}> tag`, start);
+				parser.error({
+					code: `duplicate-${slug}`,
+					message: `A component can only have one <${name}> tag`
+				}, start);
 			}
 
 			if (parser.stack.length > 1) {
-				console.log(parser.stack);
-				parser.error(`<${name}> tags cannot be inside elements or blocks`, start);
+				parser.error({
+					code: `invalid-${slug}-placement`,
+					message: `<${name}> tags cannot be inside elements or blocks`
+				}, start);
 			}
 
 			parser.metaTags[name] = true;
@@ -121,21 +127,21 @@ export default function tag(parser: Parser) {
 
 	if (isClosingTag) {
 		if (isVoidElementName(name)) {
-			parser.error(
-				`<${name}> is a void element and cannot have children, or a closing tag`,
-				start
-			);
+			parser.error({
+				code: `invalid-void-content`,
+				message: `<${name}> is a void element and cannot have children, or a closing tag`
+			}, start);
 		}
 
-		if (!parser.eat('>')) parser.error(`Expected '>'`);
+		parser.eat('>', true);
 
 		// close any elements that don't have their own closing tags, e.g. <div><p></div>
 		while (parent.name !== name) {
 			if (parent.type !== 'Element')
-				parser.error(
-					`</${name}> attempted to close an element that was not open`,
-					start
-				);
+				parser.error({
+					code: `invalid-closing-tag`,
+					message: `</${name}> attempted to close an element that was not open`
+				}, start);
 
 			parent.end = start;
 			parser.stack.pop();
@@ -161,10 +167,10 @@ export default function tag(parser: Parser) {
 		while (i--) {
 			const item = parser.stack[i];
 			if (item.type === 'EachBlock') {
-				parser.error(
-					`<slot> cannot be a child of an each-block`,
-					start
-				);
+				parser.error({
+					code: `invalid-slot-placement`,
+					message: `<slot> cannot be a child of an each-block`
+				}, start);
 			}
 		}
 	}
@@ -182,7 +188,10 @@ export default function tag(parser: Parser) {
 	let attribute;
 	while ((attribute = readAttribute(parser, uniqueNames))) {
 		if (attribute.type === 'Binding' && !parser.allowBindings) {
-			parser.error(`Two-way binding is disabled`, attribute.start);
+			parser.error({
+				code: `binding-disabled`,
+				message: `Two-way binding is disabled`
+			}, attribute.start);
 		}
 
 		element.attributes.push(attribute);
@@ -193,12 +202,18 @@ export default function tag(parser: Parser) {
 		// TODO post v2, treat this just as any other attribute
 		const index = element.attributes.findIndex(attr => attr.name === 'this');
 		if (!~index) {
-			parser.error(`<svelte:component> must have a 'this' attribute`, start);
+			parser.error({
+				code: `missing-component-definition`,
+				message: `<svelte:component> must have a 'this' attribute`
+			}, start);
 		}
 
 		const definition = element.attributes.splice(index, 1)[0];
 		if (definition.value === true || definition.value.length !== 1 || definition.value[0].type === 'Text') {
-			parser.error(`invalid component definition`, definition.start);
+			parser.error({
+				code: `invalid-component-definition`,
+				message: `invalid component definition`
+			}, definition.start);
 		}
 
 		element.expression = definition.value[0].expression;
@@ -210,9 +225,10 @@ export default function tag(parser: Parser) {
 
 		if (parser[special.property]) {
 			parser.index = start;
-			parser.error(
-				`You can only have one top-level <${name}> tag per component`
-			);
+			parser.error({
+				code: `duplicate-${name}`,
+				message: `You can only have one top-level <${name}> tag per component`
+			});
 		}
 
 		parser.eat('>', true);
@@ -282,10 +298,10 @@ function readTagName(parser: Parser) {
 		}
 
 		if (!legal) {
-			parser.error(
-				`<${SELF}> components can only exist inside if-blocks or each-blocks`,
-				start
-			);
+			parser.error({
+				code: `invalid-self-placement`,
+				message: `<${SELF}> components can only exist inside if-blocks or each-blocks`
+			}, start);
 		}
 
 		return SELF;
@@ -298,7 +314,10 @@ function readTagName(parser: Parser) {
 	if (metaTags.has(name)) return name;
 
 	if (!validTagName.test(name)) {
-		parser.error(`Expected valid tag name`, start);
+		parser.error({
+			code: `invalid-tag-name`,
+			message: `Expected valid tag name`
+		}, start);
 	}
 
 	return name;
@@ -324,7 +343,10 @@ function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 			};
 		} else {
 			if (!parser.v2) {
-				parser.error('Expected spread operator (...)');
+				parser.error({
+					code: `expected-spread`,
+					message: 'Expected spread operator (...)'
+				});
 			}
 
 			const valueStart = parser.index;
@@ -356,7 +378,10 @@ function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 	let name = parser.readUntil(/(\s|=|\/|>)/);
 	if (!name) return null;
 	if (uniqueNames.has(name)) {
-		parser.error('Attributes need to be unique', start);
+		parser.error({
+			code: `duplicate-attribute`,
+			message: 'Attributes need to be unique'
+		}, start);
 	}
 
 	uniqueNames.add(name);
@@ -444,5 +469,8 @@ function readSequence(parser: Parser, done: () => boolean) {
 		}
 	}
 
-	parser.error(`Unexpected end of input`);
+	parser.error({
+		code: `unexpected-eof`,
+		message: `Unexpected end of input`
+	});
 }
\ No newline at end of file
diff --git a/src/validate/js/propValidators/components.ts b/src/validate/js/propValidators/components.ts
index 09f958c0ce..10a528b53b 100644
--- a/src/validate/js/propValidators/components.ts
+++ b/src/validate/js/propValidators/components.ts
@@ -7,7 +7,7 @@ import { Node } from '../../../interfaces';
 export default function components(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ObjectExpression') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-components-property`,
 			message: `The 'components' property must be an object literal`
 		});
 	}
diff --git a/src/validate/js/propValidators/computed.ts b/src/validate/js/propValidators/computed.ts
index 2e86e5ca04..4b1a5ff061 100644
--- a/src/validate/js/propValidators/computed.ts
+++ b/src/validate/js/propValidators/computed.ts
@@ -16,7 +16,7 @@ const isFunctionExpression = new Set([
 export default function computed(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ObjectExpression') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-computed-property`,
 			message: `The 'computed' property must be an object literal`
 		});
 	}
diff --git a/src/validate/js/propValidators/data.ts b/src/validate/js/propValidators/data.ts
index 064703cd85..bf718d1745 100644
--- a/src/validate/js/propValidators/data.ts
+++ b/src/validate/js/propValidators/data.ts
@@ -8,7 +8,7 @@ export default function data(validator: Validator, prop: Node) {
 
 	if (disallowed.has(prop.value.type)) {
 		validator.error(prop.value, {
-			code: `invalid-property`,
+			code: `invalid-data-property`,
 			message: `'data' must be a function`
 		});
 	}
diff --git a/src/validate/js/propValidators/events.ts b/src/validate/js/propValidators/events.ts
index bf72fadac4..52a7790fa2 100644
--- a/src/validate/js/propValidators/events.ts
+++ b/src/validate/js/propValidators/events.ts
@@ -6,7 +6,7 @@ import { Node } from '../../../interfaces';
 export default function events(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ObjectExpression') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-events-property`,
 			message: `The 'events' property must be an object literal`
 		});
 	}
diff --git a/src/validate/js/propValidators/helpers.ts b/src/validate/js/propValidators/helpers.ts
index 77624ad49b..0fb14aabb8 100644
--- a/src/validate/js/propValidators/helpers.ts
+++ b/src/validate/js/propValidators/helpers.ts
@@ -9,7 +9,7 @@ import isThisGetCallExpression from '../../../utils/isThisGetCallExpression';
 export default function helpers(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ObjectExpression') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-helpers-property`,
 			message: `The 'helpers' property must be an object literal`
 		});
 	}
diff --git a/src/validate/js/propValidators/immutable.ts b/src/validate/js/propValidators/immutable.ts
index cf1dd19cb9..d445b79b1f 100644
--- a/src/validate/js/propValidators/immutable.ts
+++ b/src/validate/js/propValidators/immutable.ts
@@ -4,7 +4,7 @@ import { Node } from '../../../interfaces';
 export default function immutable(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'Literal' || typeof prop.value.value !== 'boolean') {
 		validator.error(prop.value, {
-			code: `invalid-property`,
+			code: `invalid-immutable-property`,
 			message: `'immutable' must be a boolean literal`
 		});
 	}
diff --git a/src/validate/js/propValidators/methods.ts b/src/validate/js/propValidators/methods.ts
index 84f83af7ea..3956855150 100644
--- a/src/validate/js/propValidators/methods.ts
+++ b/src/validate/js/propValidators/methods.ts
@@ -11,7 +11,7 @@ const builtin = new Set(['set', 'get', 'on', 'fire', 'observe', 'destroy']);
 export default function methods(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ObjectExpression') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-methods-property`,
 			message: `The 'methods' property must be an object literal`
 		});
 	}
diff --git a/src/validate/js/propValidators/namespace.ts b/src/validate/js/propValidators/namespace.ts
index ffcbda5863..1e0e05b04b 100644
--- a/src/validate/js/propValidators/namespace.ts
+++ b/src/validate/js/propValidators/namespace.ts
@@ -11,7 +11,7 @@ export default function namespace(validator: Validator, prop: Node) {
 
 	if (typeof ns !== 'string') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-namespace-property`,
 			message: `The 'namespace' property must be a string literal representing a valid namespace`
 		});
 	}
@@ -20,12 +20,12 @@ export default function namespace(validator: Validator, prop: Node) {
 		const match = fuzzymatch(ns, namespaces.validNamespaces);
 		if (match) {
 			validator.error(prop, {
-				code: `invalid-property`,
+				code: `invalid-namespace-property`,
 				message: `Invalid namespace '${ns}' (did you mean '${match}'?)`
 			});
 		} else {
 			validator.error(prop, {
-				code: `invalid-property`,
+				code: `invalid-namespace-property`,
 				message: `Invalid namespace '${ns}'`
 			});
 		}
diff --git a/src/validate/js/propValidators/oncreate.ts b/src/validate/js/propValidators/oncreate.ts
index db1e602812..1dc231ca25 100644
--- a/src/validate/js/propValidators/oncreate.ts
+++ b/src/validate/js/propValidators/oncreate.ts
@@ -6,7 +6,7 @@ export default function oncreate(validator: Validator, prop: Node) {
 	if (prop.value.type === 'ArrowFunctionExpression') {
 		if (usesThisOrArguments(prop.value.body)) {
 			validator.error(prop, {
-				code: `invalid-property`,
+				code: `invalid-oncreate-property`,
 				message: `'oncreate' should be a function expression, not an arrow function expression`
 			});
 		}
diff --git a/src/validate/js/propValidators/ondestroy.ts b/src/validate/js/propValidators/ondestroy.ts
index ff2565fffb..90ccd0dfd1 100644
--- a/src/validate/js/propValidators/ondestroy.ts
+++ b/src/validate/js/propValidators/ondestroy.ts
@@ -6,7 +6,7 @@ export default function ondestroy(validator: Validator, prop: Node) {
 	if (prop.value.type === 'ArrowFunctionExpression') {
 		if (usesThisOrArguments(prop.value.body)) {
 			validator.error(prop, {
-				code: `invalid-property`,
+				code: `invalid-ondestroy-property`,
 				message: `'ondestroy' should be a function expression, not an arrow function expression`
 			});
 		}
diff --git a/src/validate/js/propValidators/props.ts b/src/validate/js/propValidators/props.ts
index 0030e0db40..482d44652c 100644
--- a/src/validate/js/propValidators/props.ts
+++ b/src/validate/js/propValidators/props.ts
@@ -5,7 +5,7 @@ import nodeToString from '../../../utils/nodeToString';
 export default function props(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ArrayExpression') {
 		validator.error(prop.value, {
-			code: `invalid-property`,
+			code: `invalid-props-property`,
 			message: `'props' must be an array expression, if specified`
 		});
 	}
@@ -13,7 +13,7 @@ export default function props(validator: Validator, prop: Node) {
 	prop.value.elements.forEach((element: Node) => {
 		if (typeof nodeToString(element) !== 'string') {
 			validator.error(element, {
-				code: `invalid-property`,
+				code: `invalid-props-property`,
 				message: `'props' must be an array of string literals`
 			});
 		}
diff --git a/src/validate/js/propValidators/setup.ts b/src/validate/js/propValidators/setup.ts
index 709fee8c9a..023c9ccf38 100644
--- a/src/validate/js/propValidators/setup.ts
+++ b/src/validate/js/propValidators/setup.ts
@@ -8,7 +8,7 @@ export default function setup(validator: Validator, prop: Node) {
 
 	if (disallowed.has(prop.value.type)) {
 		validator.error(prop.value, {
-			code: `invalid-property`,
+			code: `invalid-setup-property`,
 			message: `'setup' must be a function`
 		});
 	}
diff --git a/src/validate/js/propValidators/tag.ts b/src/validate/js/propValidators/tag.ts
index 3eb76ee5e8..dc9b2438e4 100644
--- a/src/validate/js/propValidators/tag.ts
+++ b/src/validate/js/propValidators/tag.ts
@@ -6,14 +6,14 @@ export default function tag(validator: Validator, prop: Node) {
 	const tag = nodeToString(prop.value);
 	if (typeof tag !== 'string') {
 		validator.error(prop.value, {
-			code: `invalid-property`,
+			code: `invalid-tag-property`,
 			message: `'tag' must be a string literal`
 		});
 	}
 
 	if (!/^[a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]+$/.test(tag)) {
 		validator.error(prop.value, {
-			code: `invalid-property`,
+			code: `invalid-tag-property`,
 			message: `tag name must be two or more words joined by the '-' character`
 		});
 	}
diff --git a/src/validate/js/propValidators/transitions.ts b/src/validate/js/propValidators/transitions.ts
index 5a814d244f..a124e192f4 100644
--- a/src/validate/js/propValidators/transitions.ts
+++ b/src/validate/js/propValidators/transitions.ts
@@ -6,7 +6,7 @@ import { Node } from '../../../interfaces';
 export default function transitions(validator: Validator, prop: Node) {
 	if (prop.value.type !== 'ObjectExpression') {
 		validator.error(prop, {
-			code: `invalid-property`,
+			code: `invalid-transitions-property`,
 			message: `The 'transitions' property must be an object literal`
 		});
 	}
diff --git a/test/parser/index.js b/test/parser/index.js
index dd692f8c6f..06383b975f 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -32,6 +32,7 @@ describe('parse', () => {
 					if (!expectedError) throw err;
 
 					try {
+						assert.equal(err.code, expectedError.code);
 						assert.equal(err.message, expectedError.message);
 						assert.deepEqual(err.loc, expectedError.loc);
 						assert.equal(err.pos, expectedError.pos);
diff --git a/test/parser/samples/attribute-unique-error/error-v2.json b/test/parser/samples/attribute-unique-error/error-v2.json
index b4ab7a57b5..737157b246 100644
--- a/test/parser/samples/attribute-unique-error/error-v2.json
+++ b/test/parser/samples/attribute-unique-error/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "duplicate-attribute",
 	"message": "Attributes need to be unique",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/attribute-unique-error/error.json b/test/parser/samples/attribute-unique-error/error.json
index b4ab7a57b5..737157b246 100644
--- a/test/parser/samples/attribute-unique-error/error.json
+++ b/test/parser/samples/attribute-unique-error/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "duplicate-attribute",
 	"message": "Attributes need to be unique",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-binding-disabled/error-v2.json b/test/parser/samples/error-binding-disabled/error-v2.json
index 36ad59d26f..71953c4176 100644
--- a/test/parser/samples/error-binding-disabled/error-v2.json
+++ b/test/parser/samples/error-binding-disabled/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "binding-disabled",
 	"message": "Two-way binding is disabled",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-binding-disabled/error.json b/test/parser/samples/error-binding-disabled/error.json
index 36ad59d26f..71953c4176 100644
--- a/test/parser/samples/error-binding-disabled/error.json
+++ b/test/parser/samples/error-binding-disabled/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "binding-disabled",
 	"message": "Two-way binding is disabled",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-binding-mustaches/error-v2.json b/test/parser/samples/error-binding-mustaches/error-v2.json
index 92bb2eb1eb..4d23927086 100644
--- a/test/parser/samples/error-binding-mustaches/error-v2.json
+++ b/test/parser/samples/error-binding-mustaches/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "directive values should not be wrapped — use 'foo', not '{foo}'",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-binding-mustaches/error.json b/test/parser/samples/error-binding-mustaches/error.json
index f4a820d6d6..0c4f9e01bd 100644
--- a/test/parser/samples/error-binding-mustaches/error.json
+++ b/test/parser/samples/error-binding-mustaches/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "directive values should not be wrapped — use 'foo', not '{{foo}}'",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-binding-rvalue/error-v2.json b/test/parser/samples/error-binding-rvalue/error-v2.json
index 63f6711cd1..b774b8a29f 100644
--- a/test/parser/samples/error-binding-rvalue/error-v2.json
+++ b/test/parser/samples/error-binding-rvalue/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
 	"pos": 19,
 	"loc": {
diff --git a/test/parser/samples/error-binding-rvalue/error.json b/test/parser/samples/error-binding-rvalue/error.json
index 63f6711cd1..b774b8a29f 100644
--- a/test/parser/samples/error-binding-rvalue/error.json
+++ b/test/parser/samples/error-binding-rvalue/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
 	"pos": 19,
 	"loc": {
diff --git a/test/parser/samples/error-comment-unclosed/error-v2.json b/test/parser/samples/error-comment-unclosed/error-v2.json
index f392e12fa1..d83ecbdc09 100644
--- a/test/parser/samples/error-comment-unclosed/error-v2.json
+++ b/test/parser/samples/error-comment-unclosed/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "unexpected-eof",
 	"message": "comment was left open, expected -->",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-comment-unclosed/error.json b/test/parser/samples/error-comment-unclosed/error.json
index f392e12fa1..d83ecbdc09 100644
--- a/test/parser/samples/error-comment-unclosed/error.json
+++ b/test/parser/samples/error-comment-unclosed/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "unexpected-eof",
 	"message": "comment was left open, expected -->",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-css/error-v2.json b/test/parser/samples/error-css/error-v2.json
index 177f6d977f..db6703b3d0 100644
--- a/test/parser/samples/error-css/error-v2.json
+++ b/test/parser/samples/error-css/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "css-syntax-error",
 	"message": "LeftCurlyBracket is expected",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-css/error.json b/test/parser/samples/error-css/error.json
index 177f6d977f..db6703b3d0 100644
--- a/test/parser/samples/error-css/error.json
+++ b/test/parser/samples/error-css/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "css-syntax-error",
 	"message": "LeftCurlyBracket is expected",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-event-handler/error-v2.json b/test/parser/samples/error-event-handler/error-v2.json
index f5e603b06a..43be6e3951 100644
--- a/test/parser/samples/error-event-handler/error-v2.json
+++ b/test/parser/samples/error-event-handler/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "Expected a method call",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-event-handler/error.json b/test/parser/samples/error-event-handler/error.json
index f5e603b06a..43be6e3951 100644
--- a/test/parser/samples/error-event-handler/error.json
+++ b/test/parser/samples/error-event-handler/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "Expected a method call",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-illegal-expression/error-v2.json b/test/parser/samples/error-illegal-expression/error-v2.json
index b0b557202c..fdce2f1fb9 100644
--- a/test/parser/samples/error-illegal-expression/error-v2.json
+++ b/test/parser/samples/error-illegal-expression/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "parse-error",
 	"message": "Assigning to rvalue",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-illegal-expression/error.json b/test/parser/samples/error-illegal-expression/error.json
index 30993d29e7..345e313fb6 100644
--- a/test/parser/samples/error-illegal-expression/error.json
+++ b/test/parser/samples/error-illegal-expression/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "parse-error",
 	"message": "Assigning to rvalue",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-multiple-styles/error-v2.json b/test/parser/samples/error-multiple-styles/error-v2.json
index 421c5558a7..937a37a1f3 100644
--- a/test/parser/samples/error-multiple-styles/error-v2.json
+++ b/test/parser/samples/error-multiple-styles/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "duplicate-style",
 	"message": "You can only have one top-level <style> tag per component",
 	"loc": {
 		"line": 9,
diff --git a/test/parser/samples/error-multiple-styles/error.json b/test/parser/samples/error-multiple-styles/error.json
index 421c5558a7..937a37a1f3 100644
--- a/test/parser/samples/error-multiple-styles/error.json
+++ b/test/parser/samples/error-multiple-styles/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "duplicate-style",
 	"message": "You can only have one top-level <style> tag per component",
 	"loc": {
 		"line": 9,
diff --git a/test/parser/samples/error-ref-value/error-v2.json b/test/parser/samples/error-ref-value/error-v2.json
index 963c4656eb..b5b83782ba 100644
--- a/test/parser/samples/error-ref-value/error-v2.json
+++ b/test/parser/samples/error-ref-value/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "ref directives cannot have a value",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-ref-value/error.json b/test/parser/samples/error-ref-value/error.json
index 963c4656eb..b5b83782ba 100644
--- a/test/parser/samples/error-ref-value/error.json
+++ b/test/parser/samples/error-ref-value/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-directive-value",
 	"message": "ref directives cannot have a value",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-script-unclosed/error-v2.json b/test/parser/samples/error-script-unclosed/error-v2.json
index bb7d76e332..59c0415233 100644
--- a/test/parser/samples/error-script-unclosed/error-v2.json
+++ b/test/parser/samples/error-script-unclosed/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "unclosed-script",
 	"message": "<script> must have a closing tag",
 	"loc": {
 		"line": 3,
diff --git a/test/parser/samples/error-script-unclosed/error.json b/test/parser/samples/error-script-unclosed/error.json
index fc928cabab..a888682fcc 100644
--- a/test/parser/samples/error-script-unclosed/error.json
+++ b/test/parser/samples/error-script-unclosed/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "unclosed-script",
 	"message": "<script> must have a closing tag",
 	"loc": {
 		"line": 3,
diff --git a/test/parser/samples/error-self-reference/error-v2.json b/test/parser/samples/error-self-reference/error-v2.json
index 3976f5f101..581f5e67a1 100644
--- a/test/parser/samples/error-self-reference/error-v2.json
+++ b/test/parser/samples/error-self-reference/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-self-placement",
 	"message": "<svelte:self> components can only exist inside if-blocks or each-blocks",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-self-reference/error.json b/test/parser/samples/error-self-reference/error.json
index 37d0dee1ab..7b42f5726c 100644
--- a/test/parser/samples/error-self-reference/error.json
+++ b/test/parser/samples/error-self-reference/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-self-placement",
 	"message": "<:Self> components can only exist inside if-blocks or each-blocks",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
index c3ddfee08d..3fd2d400f6 100644
--- a/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
+++ b/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "unexpected-eof",
 	"message": "Unexpected end of input",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/error.json b/test/parser/samples/error-unexpected-end-of-input-b/error.json
index c3ddfee08d..3fd2d400f6 100644
--- a/test/parser/samples/error-unexpected-end-of-input-b/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input-b/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "unexpected-eof",
 	"message": "Unexpected end of input",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
index 35a42489b9..2b3402a4e3 100644
--- a/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
+++ b/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "unexpected-eof",
 	"message": "Unexpected end of input",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/error.json b/test/parser/samples/error-unexpected-end-of-input-c/error.json
index 35a42489b9..2b3402a4e3 100644
--- a/test/parser/samples/error-unexpected-end-of-input-c/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input-c/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "unexpected-eof",
 	"message": "Unexpected end of input",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
index 8a78bbf501..267f245aed 100644
--- a/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
+++ b/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "unclosed-block",
 	"message": "Block was left open",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/error.json b/test/parser/samples/error-unexpected-end-of-input-d/error.json
index 8a78bbf501..267f245aed 100644
--- a/test/parser/samples/error-unexpected-end-of-input-d/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input-d/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "unclosed-block",
 	"message": "Block was left open",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input/error-v2.json b/test/parser/samples/error-unexpected-end-of-input/error-v2.json
index 87ecce83bc..9239341473 100644
--- a/test/parser/samples/error-unexpected-end-of-input/error-v2.json
+++ b/test/parser/samples/error-unexpected-end-of-input/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "unclosed-element",
 	"message": "<div> was left open",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unexpected-end-of-input/error.json b/test/parser/samples/error-unexpected-end-of-input/error.json
index 87ecce83bc..9239341473 100644
--- a/test/parser/samples/error-unexpected-end-of-input/error.json
+++ b/test/parser/samples/error-unexpected-end-of-input/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "unclosed-element",
 	"message": "<div> was left open",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unmatched-closing-tag/error-v2.json b/test/parser/samples/error-unmatched-closing-tag/error-v2.json
index 3dd72b28da..320eb966c9 100644
--- a/test/parser/samples/error-unmatched-closing-tag/error-v2.json
+++ b/test/parser/samples/error-unmatched-closing-tag/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-closing-tag",
 	"message": "</div> attempted to close an element that was not open",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-unmatched-closing-tag/error.json b/test/parser/samples/error-unmatched-closing-tag/error.json
index 3dd72b28da..320eb966c9 100644
--- a/test/parser/samples/error-unmatched-closing-tag/error.json
+++ b/test/parser/samples/error-unmatched-closing-tag/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-closing-tag",
 	"message": "</div> attempted to close an element that was not open",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-void-closing/error-v2.json b/test/parser/samples/error-void-closing/error-v2.json
index 8756a51878..fac1d04a13 100644
--- a/test/parser/samples/error-void-closing/error-v2.json
+++ b/test/parser/samples/error-void-closing/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-void-content",
 	"message": "<input> is a void element and cannot have children, or a closing tag",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-void-closing/error.json b/test/parser/samples/error-void-closing/error.json
index 8756a51878..fac1d04a13 100644
--- a/test/parser/samples/error-void-closing/error.json
+++ b/test/parser/samples/error-void-closing/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-void-content",
 	"message": "<input> is a void element and cannot have children, or a closing tag",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-window-children/error-v2.json b/test/parser/samples/error-window-children/error-v2.json
index 53fa535b55..88c8968fd8 100644
--- a/test/parser/samples/error-window-children/error-v2.json
+++ b/test/parser/samples/error-window-children/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-window-content",
 	"message": "<svelte:window> cannot have children",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-window-children/error.json b/test/parser/samples/error-window-children/error.json
index 8ff51ca8fb..85261c35b2 100644
--- a/test/parser/samples/error-window-children/error.json
+++ b/test/parser/samples/error-window-children/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-window-content",
 	"message": "<:Window> cannot have children",
 	"loc": {
 		"line": 1,
diff --git a/test/parser/samples/error-window-duplicate/error-v2.json b/test/parser/samples/error-window-duplicate/error-v2.json
index 258a6a5028..da820574e1 100644
--- a/test/parser/samples/error-window-duplicate/error-v2.json
+++ b/test/parser/samples/error-window-duplicate/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "duplicate-window",
 	"message": "A component can only have one <svelte:window> tag",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-window-duplicate/error.json b/test/parser/samples/error-window-duplicate/error.json
index 1e86fafea2..0fa9309f46 100644
--- a/test/parser/samples/error-window-duplicate/error.json
+++ b/test/parser/samples/error-window-duplicate/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "duplicate-window",
 	"message": "A component can only have one <:Window> tag",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-window-inside-block/error-v2.json b/test/parser/samples/error-window-inside-block/error-v2.json
index 81c05fd42a..77ecd08eb3 100644
--- a/test/parser/samples/error-window-inside-block/error-v2.json
+++ b/test/parser/samples/error-window-inside-block/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-window-placement",
 	"message": "<svelte:window> tags cannot be inside elements or blocks",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-window-inside-block/error.json b/test/parser/samples/error-window-inside-block/error.json
index d6f6bd2f33..87e0d409ba 100644
--- a/test/parser/samples/error-window-inside-block/error.json
+++ b/test/parser/samples/error-window-inside-block/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-window-placement",
 	"message": "<:Window> tags cannot be inside elements or blocks",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-window-inside-element/error-v2.json b/test/parser/samples/error-window-inside-element/error-v2.json
index 4c786383fc..60ca3b9883 100644
--- a/test/parser/samples/error-window-inside-element/error-v2.json
+++ b/test/parser/samples/error-window-inside-element/error-v2.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-window-placement",
 	"message": "<svelte:window> tags cannot be inside elements or blocks",
 	"loc": {
 		"line": 2,
diff --git a/test/parser/samples/error-window-inside-element/error.json b/test/parser/samples/error-window-inside-element/error.json
index 5c28694d61..4f37e8cd7f 100644
--- a/test/parser/samples/error-window-inside-element/error.json
+++ b/test/parser/samples/error-window-inside-element/error.json
@@ -1,4 +1,5 @@
 {
+	"code": "invalid-window-placement",
 	"message": "<:Window> tags cannot be inside elements or blocks",
 	"loc": {
 		"line": 2,
diff --git a/test/validator/index.js b/test/validator/index.js
index c79c5c07d8..211c763f48 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -2,7 +2,7 @@ import * as fs from "fs";
 import assert from "assert";
 import { svelte, loadConfig, tryToLoadJson } from "../helpers.js";
 
-describe.only("validate", () => {
+describe("validate", () => {
 	fs.readdirSync("test/validator/samples").forEach(dir => {
 		if (dir[0] === ".") return;
 
diff --git a/test/validator/samples/each-block-invalid-context-destructured/errors.json b/test/validator/samples/each-block-invalid-context-destructured/errors.json
index 42ebc035bd..abec802656 100644
--- a/test/validator/samples/each-block-invalid-context-destructured/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured/errors.json
@@ -1,4 +1,5 @@
 [{
+	"code": "unexpected-reserved-word",
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
 	"loc": {
 		"line": 1,
diff --git a/test/validator/samples/each-block-invalid-context/errors.json b/test/validator/samples/each-block-invalid-context/errors.json
index f39ce80b39..dea69922d9 100644
--- a/test/validator/samples/each-block-invalid-context/errors.json
+++ b/test/validator/samples/each-block-invalid-context/errors.json
@@ -1,4 +1,5 @@
 [{
+	"code": "unexpected-reserved-word",
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
 	"loc": {
 		"line": 1,
diff --git a/test/validator/samples/export-default-duplicated/errors.json b/test/validator/samples/export-default-duplicated/errors.json
index 1b5263f27c..dc0137c2c2 100644
--- a/test/validator/samples/export-default-duplicated/errors.json
+++ b/test/validator/samples/export-default-duplicated/errors.json
@@ -1,4 +1,5 @@
 [{
+	"code": "parse-error",
 	"message": "Duplicate export 'default'",
 	"pos": 37,
 	"loc": {
diff --git a/test/validator/samples/namespace-invalid-unguessable/errors.json b/test/validator/samples/namespace-invalid-unguessable/errors.json
index c734fbc9bb..e449e3fd9b 100644
--- a/test/validator/samples/namespace-invalid-unguessable/errors.json
+++ b/test/validator/samples/namespace-invalid-unguessable/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'lol'",
 	"pos": 29,
 	"loc": {
diff --git a/test/validator/samples/namespace-invalid/errors.json b/test/validator/samples/namespace-invalid/errors.json
index 731363c90a..f001950993 100644
--- a/test/validator/samples/namespace-invalid/errors.json
+++ b/test/validator/samples/namespace-invalid/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'http://www.w3.org/1999/svg' (did you mean 'http://www.w3.org/2000/svg'?)",
 	"pos": 29,
 	"loc": {
diff --git a/test/validator/samples/namespace-non-literal/errors.json b/test/validator/samples/namespace-non-literal/errors.json
index dda09aabe2..9c51e2adc5 100644
--- a/test/validator/samples/namespace-non-literal/errors.json
+++ b/test/validator/samples/namespace-non-literal/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-namespace-property",
 	"message": "The 'namespace' property must be a string literal representing a valid namespace",
 	"pos": 79,
 	"loc": {
diff --git a/test/validator/samples/non-object-literal-components/errors.json b/test/validator/samples/non-object-literal-components/errors.json
index 0e6aac6612..53d6d9a0d5 100644
--- a/test/validator/samples/non-object-literal-components/errors.json
+++ b/test/validator/samples/non-object-literal-components/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-components-property",
 	"message": "The 'components' property must be an object literal",
 	"loc": {
 		"line": 3,
diff --git a/test/validator/samples/non-object-literal-events/errors.json b/test/validator/samples/non-object-literal-events/errors.json
index 88bb9e8523..ef9956051d 100644
--- a/test/validator/samples/non-object-literal-events/errors.json
+++ b/test/validator/samples/non-object-literal-events/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-events-property",
 	"message": "The 'events' property must be an object literal",
 	"loc": {
 		"line": 3,
diff --git a/test/validator/samples/non-object-literal-helpers/errors.json b/test/validator/samples/non-object-literal-helpers/errors.json
index 56048de728..cdd7310327 100644
--- a/test/validator/samples/non-object-literal-helpers/errors.json
+++ b/test/validator/samples/non-object-literal-helpers/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-helpers-property",
 	"message": "The 'helpers' property must be an object literal",
 	"loc": {
 		"line": 3,
diff --git a/test/validator/samples/non-object-literal-methods/errors.json b/test/validator/samples/non-object-literal-methods/errors.json
index 4f5767603a..731ce820f7 100644
--- a/test/validator/samples/non-object-literal-methods/errors.json
+++ b/test/validator/samples/non-object-literal-methods/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-methods-property",
 	"message": "The 'methods' property must be an object literal",
 	"loc": {
 		"line": 3,
diff --git a/test/validator/samples/non-object-literal-transitions/errors.json b/test/validator/samples/non-object-literal-transitions/errors.json
index eecdab50cf..791594f66e 100644
--- a/test/validator/samples/non-object-literal-transitions/errors.json
+++ b/test/validator/samples/non-object-literal-transitions/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-transitions-property",
 	"message": "The 'transitions' property must be an object literal",
 	"loc": {
 		"line": 3,
diff --git a/test/validator/samples/oncreate-arrow-this/errors.json b/test/validator/samples/oncreate-arrow-this/errors.json
index 61bcdc3749..469298dc4e 100644
--- a/test/validator/samples/oncreate-arrow-this/errors.json
+++ b/test/validator/samples/oncreate-arrow-this/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-oncreate-property",
 	"message": "'oncreate' should be a function expression, not an arrow function expression",
 	"pos": 29,
 	"loc": {
diff --git a/test/validator/samples/ondestroy-arrow-this/errors.json b/test/validator/samples/ondestroy-arrow-this/errors.json
index ab252e3289..80d227e1cc 100644
--- a/test/validator/samples/ondestroy-arrow-this/errors.json
+++ b/test/validator/samples/ondestroy-arrow-this/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-ondestroy-property",
 	"message": "'ondestroy' should be a function expression, not an arrow function expression",
 	"pos": 29,
 	"loc": {
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
index eb547398ae..764b911fb6 100644
--- a/test/validator/samples/properties-computed-must-be-an-object/errors.json
+++ b/test/validator/samples/properties-computed-must-be-an-object/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-computed-property",
 	"message": "The 'computed' property must be an object literal",
 	"loc": {
 		"line": 5,
diff --git a/test/validator/samples/properties-data-must-be-function/errors.json b/test/validator/samples/properties-data-must-be-function/errors.json
index 2947c44455..68fe8eafb9 100644
--- a/test/validator/samples/properties-data-must-be-function/errors.json
+++ b/test/validator/samples/properties-data-must-be-function/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-data-property",
 	"message": "'data' must be a function",
 	"loc": {
 		"line": 5,
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
index 1114860ea0..cd5be4fa46 100644
--- a/test/validator/samples/properties-props-must-be-an-array/errors.json
+++ b/test/validator/samples/properties-props-must-be-an-array/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-props-property",
 	"message": "'props' must be an array expression, if specified",
 	"loc": {
 		"line": 5,
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
index 12f7eaf687..0f9b383343 100644
--- 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
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-props-property",
 	"message": "'props' must be an array of string literals",
 	"loc": {
 		"line": 5,
diff --git a/test/validator/samples/tag-invalid/errors.json b/test/validator/samples/tag-invalid/errors.json
index 5be5a54df1..9dc696463c 100644
--- a/test/validator/samples/tag-invalid/errors.json
+++ b/test/validator/samples/tag-invalid/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-tag-property",
 	"message": "tag name must be two or more words joined by the '-' character",
 	"loc": {
 		"line": 3,
diff --git a/test/validator/samples/tag-non-string/errors.json b/test/validator/samples/tag-non-string/errors.json
index 5b24822156..126bad22df 100644
--- a/test/validator/samples/tag-non-string/errors.json
+++ b/test/validator/samples/tag-non-string/errors.json
@@ -1,5 +1,5 @@
 [{
-	"code": "invalid-property",
+	"code": "invalid-tag-property",
 	"message": "'tag' must be a string literal",
 	"loc": {
 		"line": 3,