diff --git a/test/helpers.js b/test/helpers.js
index 33131da558..672c15a896 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -167,8 +167,9 @@ function capitalize(str) {
 	return str[0].toUpperCase() + str.slice(1);
 }
 
-export function showOutput(cwd, options) {
+export function showOutput(cwd, options = {}) {
 	glob.sync('**/*.html', { cwd }).forEach(file => {
+		if (file[0] === '_') return;
 		const { code } = svelte.compile(
 			fs.readFileSync(`${cwd}/${file}`, 'utf-8'),
 			Object.assign(options, {
diff --git a/test/hydration/index.js b/test/hydration/index.js
new file mode 100644
index 0000000000..86df95e1c8
--- /dev/null
+++ b/test/hydration/index.js
@@ -0,0 +1,104 @@
+import assert from 'assert';
+import path from 'path';
+import fs from 'fs';
+
+import {
+	showOutput,
+	loadConfig,
+	loadSvelte,
+	env,
+	setupHtmlEqual
+} from '../helpers.js';
+
+let compileOptions = null;
+
+function getName(filename) {
+	const base = path.basename(filename).replace('.html', '');
+	return base[0].toUpperCase() + base.slice(1);
+}
+
+const nodeVersionMatch = /^v(\d)/.exec(process.version);
+const legacy = +nodeVersionMatch[1] < 6;
+const babelrc = require('../../package.json').babel;
+
+describe.only('hydration', () => {
+	before(() => {
+		const svelte = loadSvelte();
+
+		require.extensions['.html'] = function(module, filename) {
+			const options = Object.assign(
+				{ filename, name: getName(filename) },
+				compileOptions
+			);
+			let { code } = svelte.compile(fs.readFileSync(filename, 'utf-8'), options);
+
+			if (legacy) code = require('babel-core').transform(code, babelrc).code;
+
+			return module._compile(code, filename);
+		};
+
+		return setupHtmlEqual();
+	});
+
+	function runTest(dir) {
+		if (dir[0] === '.') return;
+
+		const config = loadConfig(`./hydration/samples/${dir}/_config.js`);
+
+		if (config.solo && process.env.CI) {
+			throw new Error('Forgot to remove `solo: true` from test');
+		}
+
+		(config.skip ? it.skip : config.solo ? it.only : it)(dir, () => {
+			const cwd = path.resolve(`test/hydration/samples/${dir}`);
+
+			compileOptions = config.compileOptions || {};
+			compileOptions.shared = path.resolve('shared.js');
+			compileOptions.dev = config.dev;
+			compileOptions.hydrate = true;
+
+			return env()
+				.then(window => {
+					global.window = window;
+
+					let SvelteComponent;
+
+					try {
+						SvelteComponent = require(`${cwd}/main.html`).default;
+					} catch (err) {
+						throw err;
+					}
+
+					const target = window.document.body;
+					target.innerHTML = fs.readFileSync(`${cwd}/_before.html`, 'utf-8');
+
+					const snapshot = config.snapshot ? config.snapshot(target) : {};
+
+					const component = new SvelteComponent({
+						target,
+						data: config.data
+					});
+
+					assert.htmlEqual(target.innerHTML, fs.readFileSync(`${cwd}/_after.html`, 'utf-8'));
+
+					if (config.test) {
+						config.test(assert, target, snapshot);
+					} else {
+						component.destroy();
+						assert.equal(target.innerHTML, '');
+					}
+				})
+				.catch(err => {
+					showOutput(cwd, { shared: 'svelte/shared.js' }); // eslint-disable-line no-console
+					throw err;
+				})
+				.then(() => {
+					if (config.show) showOutput(cwd, { shared: 'svelte/shared.js' });
+				});
+		});
+	}
+
+	fs.readdirSync('test/hydration/samples').forEach(dir => {
+		runTest(dir, null);
+	});
+});
diff --git a/test/hydration/samples/basic/_after.html b/test/hydration/samples/basic/_after.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/basic/_after.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/basic/_before.html b/test/hydration/samples/basic/_before.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/basic/_before.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/basic/_config.js b/test/hydration/samples/basic/_config.js
new file mode 100644
index 0000000000..79d91d0d8a
--- /dev/null
+++ b/test/hydration/samples/basic/_config.js
@@ -0,0 +1,17 @@
+export default {
+	snapshot(target) {
+		const h1 = target.querySelector('h1');
+
+		return {
+			h1,
+			text: h1.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const h1 = target.querySelector('h1');
+
+		assert.equal(h1, snapshot.h1);
+		assert.equal(h1.childNodes[0], snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/basic/main.html b/test/hydration/samples/basic/main.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/basic/main.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file