diff --git a/test/runtime/index.js b/test/runtime/index.js
index d9403bc25d..39778e0f04 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -14,6 +14,7 @@ import {
 	spaces
 } from "../helpers.js";
 
+const main = path.resolve('index.js');
 let svelte$;
 let svelte;
 
@@ -38,7 +39,9 @@ describe.only("runtime", () => {
 
 			const { js } = compile(fs.readFileSync(filename, "utf-8"), options);
 
-			return module._compile(js.code, filename);
+			const code = js.code.replace(/require\("svelte"\)/g, `require("${main}")`);
+
+			return module._compile(code, filename);
 		};
 
 		return setupHtmlEqual();
diff --git a/test/runtime/samples/autofocus/_config.js b/test/runtime/samples/autofocus/_config.js
index 2159971e56..4c2df381ed 100644
--- a/test/runtime/samples/autofocus/_config.js
+++ b/test/runtime/samples/autofocus/_config.js
@@ -1,8 +1,8 @@
 export default {
 	html: '',
 
-	test ( assert, component, target, window ) {
+	test(assert, component, target, window) {
 		component.visible = true;
-		assert.equal( component.refs.input, window.document.activeElement );
+		assert.equal(target.querySelector('input'), window.document.activeElement);
 	}
 };
diff --git a/test/runtime/samples/await-component-oncreate/Foo.html b/test/runtime/samples/await-component-oncreate/Foo.html
index 9648ef01df..9d58bc3ca1 100644
--- a/test/runtime/samples/await-component-oncreate/Foo.html
+++ b/test/runtime/samples/await-component-oncreate/Foo.html
@@ -1,14 +1,13 @@
-<p>{value}</p>
-<p>{called}</p>
-
 <script>
-	export default {
-		data() {
-			return { called: false };
-		},
+	import { onmount } from 'svelte';
+
+	export let value;
+	let called = false;
 
-		oncreate() {
-			this.set({ called: true });
-		}
-	};
-</script>
\ No newline at end of file
+	onmount(() => {
+		called = true;
+	});
+</script>
+
+<p>{value}</p>
+<p>{called}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-event/_config.js b/test/runtime/samples/await-then-catch-event/_config.js
index b0f64b10f8..26399bb045 100644
--- a/test/runtime/samples/await-then-catch-event/_config.js
+++ b/test/runtime/samples/await-then-catch-event/_config.js
@@ -16,17 +16,17 @@ export default {
 		fulfil(42);
 
 		return thePromise
-			.then(() => {
+			.then(async () => {
 				assert.htmlEqual(target.innerHTML, `
 					<button>click me</button>
 				`);
 
-				const { button } = component.refs;
+				const { button } = component;
 
 				const click = new window.MouseEvent('click');
 				button.dispatchEvent(click);
 
-				assert.equal(component.get().clicked, 42);
+				assert.equal(component.clicked, 42);
 
 				thePromise = Promise.resolve(43);
 				component.thePromise = thePromise;
@@ -34,12 +34,12 @@ export default {
 				return thePromise;
 			})
 			.then(() => {
-				const { button } = component.refs;
+				const { button } = component;
 
 				const click = new window.MouseEvent('click');
 				button.dispatchEvent(click);
 
-				assert.equal(component.get().clicked, 43);
+				assert.equal(component.clicked, 43);
 			});
 	}
 };
\ No newline at end of file
diff --git a/test/runtime/samples/await-then-catch-event/main.html b/test/runtime/samples/await-then-catch-event/main.html
index 5ddb2dde86..7ed2719e7b 100644
--- a/test/runtime/samples/await-then-catch-event/main.html
+++ b/test/runtime/samples/await-then-catch-event/main.html
@@ -1,3 +1,9 @@
+<script>
+	export let button;
+	export let thePromise;
+	export let clicked;
+</script>
+
 {#await thePromise}
 	<p>loading...</p>
 {:then theValue}