diff --git a/test/cli/samples/custom-element/src/Main.html b/test/cli/samples/custom-element/src/Main.html
index c6083164d4..3ac2c716c2 100644
--- a/test/cli/samples/custom-element/src/Main.html
+++ b/test/cli/samples/custom-element/src/Main.html
@@ -1,7 +1,3 @@
-<p>Hello world!</p>
+<svelte:meta tag="my-element"/>
 
-<script>
-	export default {
-		tag: 'my-element'
-	};
-</script>
\ No newline at end of file
+<p>Hello world!</p>
\ No newline at end of file
diff --git a/test/cli/samples/dir-sourcemap/src/Main.html b/test/cli/samples/dir-sourcemap/src/Main.html
index 0f123bb0cb..cbcde3f1ed 100644
--- a/test/cli/samples/dir-sourcemap/src/Main.html
+++ b/test/cli/samples/dir-sourcemap/src/Main.html
@@ -1,11 +1,5 @@
-<Widget/>
-
 <script>
 	import Widget from './Widget.html';
+</script>
 
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
\ No newline at end of file
+<Widget/>
\ No newline at end of file
diff --git a/test/cli/samples/dir-subdir/src/Main.html b/test/cli/samples/dir-subdir/src/Main.html
index 01fdc800d7..89391562d5 100644
--- a/test/cli/samples/dir-subdir/src/Main.html
+++ b/test/cli/samples/dir-subdir/src/Main.html
@@ -1,11 +1,5 @@
-<Widget/>
-
 <script>
 	import Widget from './widget/Widget.html';
+</script>
 
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
\ No newline at end of file
+<Widget/>
\ No newline at end of file
diff --git a/test/cli/samples/dir/src/Main.html b/test/cli/samples/dir/src/Main.html
index 0f123bb0cb..cbcde3f1ed 100644
--- a/test/cli/samples/dir/src/Main.html
+++ b/test/cli/samples/dir/src/Main.html
@@ -1,11 +1,5 @@
-<Widget/>
-
 <script>
 	import Widget from './Widget.html';
+</script>
 
-	export default {
-		components: {
-			Widget
-		}
-	};
-</script>
\ No newline at end of file
+<Widget/>
\ No newline at end of file
diff --git a/test/cli/samples/globals/src/Main.html b/test/cli/samples/globals/src/Main.html
index 053f2ec0f6..2fc0383a67 100644
--- a/test/cli/samples/globals/src/Main.html
+++ b/test/cli/samples/globals/src/Main.html
@@ -1,13 +1,5 @@
-<p>The answer is {answer}</p>
-
 <script>
 	import answer from 'the-answer';
+</script>
 
-	export default {
-		data: function () {
-			return {
-				answer: answer
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<p>The answer is {answer}</p>
\ No newline at end of file
diff --git a/test/cli/samples/sourcemap-inline/src/Main.html b/test/cli/samples/sourcemap-inline/src/Main.html
index 944b54efb9..86a14718f1 100644
--- a/test/cli/samples/sourcemap-inline/src/Main.html
+++ b/test/cli/samples/sourcemap-inline/src/Main.html
@@ -1,9 +1,9 @@
-<p>Hello world!</p>
-
 <script>
-	export default {
-		onrender () {
-			console.log( 'here' );
-		}
-	};
-</script>
\ No newline at end of file
+	import { onmount } from 'svelte';
+
+	onmount(() => {
+		console.log( 'here' );
+	});
+</script>
+
+<p>Hello world!</p>
\ No newline at end of file
diff --git a/test/cli/samples/sourcemap/src/Main.html b/test/cli/samples/sourcemap/src/Main.html
index 944b54efb9..86a14718f1 100644
--- a/test/cli/samples/sourcemap/src/Main.html
+++ b/test/cli/samples/sourcemap/src/Main.html
@@ -1,9 +1,9 @@
-<p>Hello world!</p>
-
 <script>
-	export default {
-		onrender () {
-			console.log( 'here' );
-		}
-	};
-</script>
\ No newline at end of file
+	import { onmount } from 'svelte';
+
+	onmount(() => {
+		console.log( 'here' );
+	});
+</script>
+
+<p>Hello world!</p>
\ No newline at end of file