diff --git a/src/compile/render-dom/wrappers/Element/Binding.ts b/src/compile/render-dom/wrappers/Element/Binding.ts
index 7ecff8b9de..a97d80254a 100644
--- a/src/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compile/render-dom/wrappers/Element/Binding.ts
@@ -270,8 +270,8 @@ function getValueFromDom(
 	// <select bind:value='selected>
 	if (node.name === 'select') {
 		return node.getStaticAttributeValue('multiple') === true ?
-			`@selectMultipleValue(${element.var})` :
-			`@selectValue(${element.var})`;
+			`@selectMultipleValue(this)` :
+			`@selectValue(this)`;
 	}
 
 	const type = node.getStaticAttributeValue('type');
@@ -283,16 +283,16 @@ function getValueFromDom(
 			return `@getBindingGroupValue(#component.$$bindingGroups[${bindingGroup}])`;
 		}
 
-		return `${element.var}.__value`;
+		return `this.__value`;
 	}
 
 	// <input type='range|number' bind:value>
 	if (type === 'range' || type === 'number') {
-		return `@toNumber(${element.var}.${name})`;
+		return `@toNumber(this.${name})`;
 	}
 
 	if ((name === 'buffered' || name === 'seekable' || name === 'played')) {
-		return `@timeRangesToArray(${element.var}.${name})`
+		return `@timeRangesToArray(this.${name})`
 	}
 
 	// everything else
diff --git a/test/hydration/samples/element-ref/_config.js b/test/hydration/samples/element-ref/_config.js
index 21743569bd..772fad9827 100644
--- a/test/hydration/samples/element-ref/_config.js
+++ b/test/hydration/samples/element-ref/_config.js
@@ -11,6 +11,6 @@ export default {
 		const h1 = target.querySelector('h1');
 
 		assert.equal(h1, snapshot.h1);
-		assert.equal(component.refs.h1, h1);
+		assert.equal(component.h1, h1);
 	}
 };
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-in-yield/_config.js b/test/runtime/samples/binding-select-in-yield/_config.js
index 8077b5b6eb..19cad9658b 100644
--- a/test/runtime/samples/binding-select-in-yield/_config.js
+++ b/test/runtime/samples/binding-select-in-yield/_config.js
@@ -5,8 +5,8 @@ export default {
 		letter: 'b'
 	},
 
-	test ( assert, component, target, window ) {
-		component.refs.modal.toggle();
+	test(assert, component, target, window) {
+		component.modal.toggle();
 
 		assert.htmlEqual(target.innerHTML, `
 			<span>b</span>
@@ -41,8 +41,8 @@ export default {
 			</select>
 		`);
 
-		component.refs.modal.toggle();
-		component.refs.modal.toggle();
+		component.modal.toggle();
+		component.modal.toggle();
 
 		assert.deepEqual(Array.from(select.options).map(o => o.selected), [
 			false,
diff --git a/test/runtime/samples/binding-select-in-yield/main.html b/test/runtime/samples/binding-select-in-yield/main.html
index 97528da19b..38304fba80 100644
--- a/test/runtime/samples/binding-select-in-yield/main.html
+++ b/test/runtime/samples/binding-select-in-yield/main.html
@@ -1,6 +1,7 @@
 <script>
 	import Modal from './Modal.html';
 
+	export let modal;
 	export let letter;
 	export let letters = ['a', 'b', 'c'];
 </script>
diff --git a/test/runtime/samples/bindings-before-oncreate/_config.js b/test/runtime/samples/bindings-before-oncreate/_config.js
index e9e09c678d..d2852ae0e9 100644
--- a/test/runtime/samples/bindings-before-oncreate/_config.js
+++ b/test/runtime/samples/bindings-before-oncreate/_config.js
@@ -1,5 +1,5 @@
 export default {
 	test(assert, component) {
-		assert.equal(component.refs.one.snapshot, 2);
+		assert.equal(component.one.snapshot, 2);
 	}
 };
\ No newline at end of file
diff --git a/test/runtime/samples/bindings-coalesced/_config.js b/test/runtime/samples/bindings-coalesced/_config.js
index 2fe5cbf5cd..282bce1475 100644
--- a/test/runtime/samples/bindings-coalesced/_config.js
+++ b/test/runtime/samples/bindings-coalesced/_config.js
@@ -1,6 +1,6 @@
 export default {
 	test(assert, component) {
-		const { foo, p } = component.refs;
+		const { foo, p } = component;
 
 		const values = [];
 
diff --git a/test/runtime/samples/component-nested-deep/_config.js b/test/runtime/samples/component-nested-deep/_config.js
index 63b70fe41d..bb167d8579 100644
--- a/test/runtime/samples/component-nested-deep/_config.js
+++ b/test/runtime/samples/component-nested-deep/_config.js
@@ -1,5 +1,5 @@
 export default {
 	test(assert, component) {
-		component.refs.l1.destroy();
+		component.l1.destroy();
 	}
 };
diff --git a/test/runtime/samples/component-ref/_config.js b/test/runtime/samples/component-ref/_config.js
index 25749f58d9..daea3a9811 100644
--- a/test/runtime/samples/component-ref/_config.js
+++ b/test/runtime/samples/component-ref/_config.js
@@ -1,7 +1,7 @@
 export default {
 	html: '<div><p>i am a widget</p></div>',
 	test ( assert, component ) {
-		const widget = component.refs.widget;
+		const widget = component.widget;
 		assert.ok( widget.isWidget );
 	}
 };
diff --git a/test/runtime/samples/component-slot-dynamic/_config.js b/test/runtime/samples/component-slot-dynamic/_config.js
index 17f22b2830..d0654f0143 100644
--- a/test/runtime/samples/component-slot-dynamic/_config.js
+++ b/test/runtime/samples/component-slot-dynamic/_config.js
@@ -4,6 +4,6 @@ export default {
 	`,
 
 	test(assert, component) {
-		component.refs.nested.set({ foo: 'b' });
+		component.nested.set({ foo: 'b' });
 	}
 };
diff --git a/test/runtime/samples/component-yield-if/_config.js b/test/runtime/samples/component-yield-if/_config.js
index 33f59ad605..dae32794a0 100644
--- a/test/runtime/samples/component-yield-if/_config.js
+++ b/test/runtime/samples/component-yield-if/_config.js
@@ -2,7 +2,7 @@ export default {
 	html: '<div><p></p></div>',
 
 	test ( assert, component, target ) {
-		const widget = component.refs.widget;
+		const widget = component.widget;
 
 		assert.equal( widget.get().show, false );
 
diff --git a/test/runtime/samples/deconflict-component-refs/main.html b/test/runtime/samples/deconflict-component-refs/main.html
index b1ef0bf2e3..0906135414 100644
--- a/test/runtime/samples/deconflict-component-refs/main.html
+++ b/test/runtime/samples/deconflict-component-refs/main.html
@@ -1,8 +1,13 @@
+<script>
+	export let components;
+	let name;
+</script>
+
 <ul>
 	{#each components as component}
 		<li>
 			{#if component.edit}
-				<input ref:name bind:value={component}.name />
+				<input ref:name bind:value={component.name} />
 			{:else}
 				{component.name}
 			{/if}
diff --git a/test/runtime/samples/dev-accept-declarative-store/_config.js b/test/runtime/samples/dev-accept-declarative-store/_config.js
deleted file mode 100644
index 5b9d5ecf1a..0000000000
--- a/test/runtime/samples/dev-accept-declarative-store/_config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	compileOptions: {
-		dev: true
-	}
-};
diff --git a/test/runtime/samples/dev-accept-declarative-store/main.html b/test/runtime/samples/dev-accept-declarative-store/main.html
deleted file mode 100644
index 34ae31d3b9..0000000000
--- a/test/runtime/samples/dev-accept-declarative-store/main.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<script>
-	import { Store } from '../../../../store.js';
-
-const store = new Store({ foo : "foo" });
-
-/*
-	svelte-upgrade cannot automatically transform this code —
-	it must be updated manually
-
-	store : () => store
-	*/
-</script>
-
-<p>{$foo}</p>
diff --git a/test/runtime/samples/dev-error-missing-store-option/_config.js b/test/runtime/samples/dev-error-missing-store-option/_config.js
deleted file mode 100644
index c280c8285a..0000000000
--- a/test/runtime/samples/dev-error-missing-store-option/_config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-	compileOptions: {
-		dev: true
-	},
-
-	error: `<Main$> references store properties, but no store was provided`
-};
diff --git a/test/runtime/samples/dev-error-missing-store-option/main.html b/test/runtime/samples/dev-error-missing-store-option/main.html
deleted file mode 100644
index a0f20409a6..0000000000
--- a/test/runtime/samples/dev-error-missing-store-option/main.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>{$foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/immutable-mutable/_config.js b/test/runtime/samples/immutable-mutable/_config.js
index d7381a38a2..b1c0df1890 100644
--- a/test/runtime/samples/immutable-mutable/_config.js
+++ b/test/runtime/samples/immutable-mutable/_config.js
@@ -3,7 +3,7 @@ export default {
 	html: `<div><h3>Called 0 times.</h3></div>`,
 
 	test(assert, component, target, window) {
-		var nested = component.refs.nested;
+		var nested = component.nested;
 		nested.on('state', ({ changed }) => {
 			if (changed.foo) {
 				nested.set({ count: nested.get().count + 1 });
diff --git a/test/runtime/samples/immutable-nested/_config.js b/test/runtime/samples/immutable-nested/_config.js
index 1268a4a988..0367e2e4c3 100644
--- a/test/runtime/samples/immutable-nested/_config.js
+++ b/test/runtime/samples/immutable-nested/_config.js
@@ -3,7 +3,7 @@ export default {
 	html: `<div><h3>Called 0 times.</h3></div>`,
 
 	test(assert, component, target, window) {
-		var nested = component.refs.nested;
+		var nested = component.nested;
 		nested.on('state', ({ changed }) => {
 			if (changed.foo) {
 				nested.set({ count: nested.get().count + 1 });
diff --git a/test/runtime/samples/observe-binding-ignores-unchanged/_config.js b/test/runtime/samples/observe-binding-ignores-unchanged/_config.js
index 7163e8e4ae..29f58b63a5 100644
--- a/test/runtime/samples/observe-binding-ignores-unchanged/_config.js
+++ b/test/runtime/samples/observe-binding-ignores-unchanged/_config.js
@@ -13,7 +13,7 @@ export default {
 
 	test(assert, component, target, window) {
 		let triggered = false;
-		component.refs.nested.on('state', ({ changed }) => {
+		component.nested.on('state', ({ changed }) => {
 			if (changed.field2) triggered = true;
 		});
 
diff --git a/test/runtime/samples/ondestroy-before-cleanup/_config.js b/test/runtime/samples/ondestroy-before-cleanup/_config.js
index 7610f2cf57..07f214d4a2 100644
--- a/test/runtime/samples/ondestroy-before-cleanup/_config.js
+++ b/test/runtime/samples/ondestroy-before-cleanup/_config.js
@@ -1,6 +1,6 @@
 export default {
 	test(assert, component, target) {
-		const top = component.refs.top;
+		const top = component.top;
 		const div = target.querySelector('div');
 
 		component.visible = false;
diff --git a/test/runtime/samples/onrender-chain/_config.js b/test/runtime/samples/onrender-chain/_config.js
index 33c4a8b5be..2938a184a1 100644
--- a/test/runtime/samples/onrender-chain/_config.js
+++ b/test/runtime/samples/onrender-chain/_config.js
@@ -6,7 +6,7 @@ export default {
 	`,
 
 	test(assert, component, target) {
-		component.refs.list.update();
+		component.list.update();
 
 		assert.htmlEqual(target.innerHTML, `
 			<span>1</span><span>2</span><span>3</span><span>4</span><span>5</span>
diff --git a/test/runtime/samples/refs-no-innerhtml/_config.js b/test/runtime/samples/refs-no-innerhtml/_config.js
index a1e5ddd7f1..7438c07122 100644
--- a/test/runtime/samples/refs-no-innerhtml/_config.js
+++ b/test/runtime/samples/refs-no-innerhtml/_config.js
@@ -1,7 +1,8 @@
 export default {
 	html: '<div><canvas></canvas></div>',
-	test ( assert, component, target ) {
-		const canvas = target.querySelector( 'canvas' );
-		assert.equal( canvas, component.refs.foo );
+
+	test(assert, component, target) {
+		const canvas = target.querySelector('canvas');
+		assert.equal(canvas, component.foo);
 	}
 };
diff --git a/test/runtime/samples/refs-no-innerhtml/main.html b/test/runtime/samples/refs-no-innerhtml/main.html
index 35d9d3a54b..e2f7740f2b 100644
--- a/test/runtime/samples/refs-no-innerhtml/main.html
+++ b/test/runtime/samples/refs-no-innerhtml/main.html
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <div><canvas ref:foo></canvas></div>
diff --git a/test/runtime/samples/refs-unset/_config.js b/test/runtime/samples/refs-unset/_config.js
index 340aa0d542..549cef2d80 100644
--- a/test/runtime/samples/refs-unset/_config.js
+++ b/test/runtime/samples/refs-unset/_config.js
@@ -5,19 +5,19 @@ export default {
 
 	html: '<canvas data-x="true"></canvas>',
 
-	test ( assert, component, target ) {
-		let canvas = target.querySelector( 'canvas' );
-		assert.equal( canvas, component.refs.foo );
-		assert.equal( canvas.getAttribute( 'data-x' ), 'true' );
+	test(assert, component, target) {
+		let canvas = target.querySelector('canvas');
+		assert.equal(canvas, component.foo);
+		assert.equal(canvas.getAttribute('data-x'), 'true');
 
 		component.x = false;
-		canvas = target.querySelector( 'canvas' );
-		assert.equal( canvas, component.refs.foo );
-		assert.equal( canvas.getAttribute( 'data-x' ), 'false' );
+		canvas = target.querySelector('canvas');
+		assert.equal(canvas, component.foo);
+		assert.equal(canvas.getAttribute('data-x'), 'false');
 
 		component.x = true;
-		canvas = target.querySelector( 'canvas' );
-		assert.equal( canvas, component.refs.foo );
-		assert.equal( canvas.getAttribute( 'data-x' ), 'true' );
+		canvas = target.querySelector('canvas');
+		assert.equal(canvas, component.foo);
+		assert.equal(canvas.getAttribute('data-x'), 'true');
 	}
 };
diff --git a/test/runtime/samples/refs-unset/main.html b/test/runtime/samples/refs-unset/main.html
index 6a18aa6bee..8024a67dfd 100644
--- a/test/runtime/samples/refs-unset/main.html
+++ b/test/runtime/samples/refs-unset/main.html
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#if x}
 	<canvas ref:foo data-x='true'></canvas>
 {:else}
diff --git a/test/runtime/samples/refs/_config.js b/test/runtime/samples/refs/_config.js
index e8070770ba..c55d6334f6 100644
--- a/test/runtime/samples/refs/_config.js
+++ b/test/runtime/samples/refs/_config.js
@@ -1,7 +1,8 @@
 export default {
 	html: '<canvas></canvas>',
-	test ( assert, component, target ) {
-		const canvas = target.querySelector( 'canvas' );
-		assert.equal( canvas, component.refs.foo );
+
+	test(assert, component, target) {
+		const canvas = target.querySelector('canvas');
+		assert.equal(canvas, component.foo);
 	}
 };
diff --git a/test/runtime/samples/refs/main.html b/test/runtime/samples/refs/main.html
index e5594a4af0..68b013377d 100644
--- a/test/runtime/samples/refs/main.html
+++ b/test/runtime/samples/refs/main.html
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <canvas ref:foo></canvas>
diff --git a/test/runtime/samples/transition-js-if-else-block-intro/_config.js b/test/runtime/samples/transition-js-if-else-block-intro/_config.js
index 35298aa367..f29dbfe2fa 100644
--- a/test/runtime/samples/transition-js-if-else-block-intro/_config.js
+++ b/test/runtime/samples/transition-js-if-else-block-intro/_config.js
@@ -1,18 +1,18 @@
 export default {
 	test(assert, component, target, window, raf) {
-		assert.equal(target.querySelector('div'), component.refs.no);
-		assert.equal(component.refs.no.foo, 0);
+		assert.equal(target.querySelector('div'), component.no);
+		assert.equal(component.no.foo, 0);
 
 		raf.tick(200);
-		assert.equal(component.refs.no.foo, 0.5);
+		assert.equal(component.no.foo, 0.5);
 
 		raf.tick(500);
 		component.x = true;
-		assert.equal(component.refs.no, undefined);
-		assert.equal(component.refs.yes.foo, 0);
+		assert.equal(component.no, undefined);
+		assert.equal(component.yes.foo, 0);
 
 		raf.tick(700);
-		assert.equal(component.refs.yes.foo, 0.5);
+		assert.equal(component.yes.foo, 0.5);
 
 		raf.tick(1000);
 	}