diff --git a/test/runtime/samples/immutable-mutable/Nested.html b/test/runtime/samples/immutable-mutable/Nested.html
deleted file mode 100644
index b68af94b89..0000000000
--- a/test/runtime/samples/immutable-mutable/Nested.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-	export let count = 0;
-	export let foo = { bar: 'baz' };
-</script>
-
-<h3>Called {count} times.</h3>
\ No newline at end of file
diff --git a/test/runtime/samples/immutable-mutable/_config.js b/test/runtime/samples/immutable-mutable/_config.js
deleted file mode 100644
index b1c0df1890..0000000000
--- a/test/runtime/samples/immutable-mutable/_config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default {
-	immutable: true,
-	html: `<div><h3>Called 0 times.</h3></div>`,
-
-	test(assert, component, target, window) {
-		var nested = component.nested;
-		nested.on('state', ({ changed }) => {
-			if (changed.foo) {
-				nested.set({ count: nested.get().count + 1 });
-			}
-		});
-
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 0 times.</h3></div>`);
-
-		nested.set({ foo: nested.get().foo });
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
-	}
-};
diff --git a/test/runtime/samples/immutable-mutable/main.html b/test/runtime/samples/immutable-mutable/main.html
deleted file mode 100644
index f036cbdfc3..0000000000
--- a/test/runtime/samples/immutable-mutable/main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	export let nested;
-
-	import Nested from './Nested.html';
-</script>
-
-<div>
-  <Nested ref:nested />
-</div>
diff --git a/test/runtime/samples/immutable-nested/Nested.html b/test/runtime/samples/immutable-nested/Nested.html
index b68af94b89..402c615575 100644
--- a/test/runtime/samples/immutable-nested/Nested.html
+++ b/test/runtime/samples/immutable-nested/Nested.html
@@ -1,6 +1,17 @@
 <script>
+	import { beforeRender, onMount } from 'svelte';
+
+	let mounted;
 	export let count = 0;
 	export let foo = { bar: 'baz' };
+
+	onMount(() => {
+		mounted = true;
+	});
+
+	beforeRender(() => {
+		if (mounted) count += 1;
+	});
 </script>
 
 <h3>Called {count} times.</h3>
\ No newline at end of file
diff --git a/test/runtime/samples/immutable-nested/_config.js b/test/runtime/samples/immutable-nested/_config.js
index 0367e2e4c3..c0e280a72a 100644
--- a/test/runtime/samples/immutable-nested/_config.js
+++ b/test/runtime/samples/immutable-nested/_config.js
@@ -1,18 +1,13 @@
 export default {
 	immutable: true,
-	html: `<div><h3>Called 0 times.</h3></div>`,
+	html: `<div><h3>Called 1 times.</h3></div>`,
 
 	test(assert, component, target, window) {
 		var nested = component.nested;
-		nested.on('state', ({ changed }) => {
-			if (changed.foo) {
-				nested.set({ count: nested.get().count + 1 });
-			}
-		});
 
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 0 times.</h3></div>`);
+		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
 
-		nested.set({ foo: nested.get().foo });
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 0 times.</h3></div>`);
+		nested.foo = nested.foo;
+		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
 	}
 };