diff --git a/test/hydration/samples/binding-input/main.html b/test/hydration/samples/binding-input/main.html
index d4359f73e4..12c7b9ea43 100644
--- a/test/hydration/samples/binding-input/main.html
+++ b/test/hydration/samples/binding-input/main.html
@@ -1,2 +1,2 @@
 <input bind:value='name'>
-<p>Hello {{name}}!</p>
\ No newline at end of file
+<p>Hello {name}!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text-changed/main.html b/test/hydration/samples/dynamic-text-changed/main.html
index c8dd28836a..543c6059c4 100644
--- a/test/hydration/samples/dynamic-text-changed/main.html
+++ b/test/hydration/samples/dynamic-text-changed/main.html
@@ -1 +1 @@
-<h1>Hello {{name}}!</h1>
\ No newline at end of file
+<h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text/main.html b/test/hydration/samples/dynamic-text/main.html
index c8dd28836a..543c6059c4 100644
--- a/test/hydration/samples/dynamic-text/main.html
+++ b/test/hydration/samples/dynamic-text/main.html
@@ -1 +1 @@
-<h1>Hello {{name}}!</h1>
\ No newline at end of file
+<h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/each-block-arg-clash/main.html b/test/hydration/samples/each-block-arg-clash/main.html
index b093160f6a..f42706e152 100644
--- a/test/hydration/samples/each-block-arg-clash/main.html
+++ b/test/hydration/samples/each-block-arg-clash/main.html
@@ -1,5 +1,5 @@
 <ul>
-	{{#each things.foo as foo}}
-		<li>{{foo}}</li>
-	{{/each}}
+	{#each things.foo as foo}
+		<li>{foo}</li>
+	{/each}
 </ul>
diff --git a/test/hydration/samples/each-block/main.html b/test/hydration/samples/each-block/main.html
index 821f6c53e2..6c5973e9a4 100644
--- a/test/hydration/samples/each-block/main.html
+++ b/test/hydration/samples/each-block/main.html
@@ -1,5 +1,5 @@
 <ul>
-	{{#each things as thing}}
-		<li>{{thing}}</li>
-	{{/each}}
+	{#each things as thing}
+		<li>{thing}</li>
+	{/each}
 </ul>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-added/main.html b/test/hydration/samples/element-attribute-added/main.html
index 6b149d165f..335e3d4e1f 100644
--- a/test/hydration/samples/element-attribute-added/main.html
+++ b/test/hydration/samples/element-attribute-added/main.html
@@ -1 +1 @@
-<div class='{{class}}'></div>
\ No newline at end of file
+<div class='{class}'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/main.html b/test/hydration/samples/event-handler/main.html
index 9533175147..83ecadb0d6 100644
--- a/test/hydration/samples/event-handler/main.html
+++ b/test/hydration/samples/event-handler/main.html
@@ -1,5 +1,5 @@
 <button on:click='set({ clicked: true })'>click me</button>
 
-{{#if clicked}}
+{#if clicked}
 	<p>clicked!</p>
-{{/if}}
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-anchor/main.html b/test/hydration/samples/if-block-anchor/main.html
index b46363fecb..59ea50e259 100644
--- a/test/hydration/samples/if-block-anchor/main.html
+++ b/test/hydration/samples/if-block-anchor/main.html
@@ -1,9 +1,9 @@
 <div>
-	{{#if foo}}
+	{#if foo}
 		<p>foo!</p>
-	{{/if}}
+	{/if}
 
-	{{#if bar}}
+	{#if bar}
 		<p>bar!</p>
-	{{/if}}
+	{/if}
 </div>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-false/main.html b/test/hydration/samples/if-block-false/main.html
index 4d42d3e7d7..5a91401cdb 100644
--- a/test/hydration/samples/if-block-false/main.html
+++ b/test/hydration/samples/if-block-false/main.html
@@ -1,5 +1,5 @@
 <p>before</p>
-{{#if foo}}
+{#if foo}
 	<p>foo!</p>
-{{/if}}
+{/if}
 <p>after</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-update/main.html b/test/hydration/samples/if-block-update/main.html
index 82c5a193fe..b43dab708f 100644
--- a/test/hydration/samples/if-block-update/main.html
+++ b/test/hydration/samples/if-block-update/main.html
@@ -1,7 +1,7 @@
-{{#if foo}}
+{#if foo}
 	<p>foo!</p>
-{{/if}}
+{/if}
 
-{{#if bar}}
+{#if bar}
 	<p>bar!</p>
-{{/if}}
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/hydration/samples/if-block/main.html b/test/hydration/samples/if-block/main.html
index 050095b913..e36517e10c 100644
--- a/test/hydration/samples/if-block/main.html
+++ b/test/hydration/samples/if-block/main.html
@@ -1,3 +1,3 @@
-{{#if foo}}
+{#if foo}
 	<p>foo!</p>
-{{/if}}
\ No newline at end of file
+{/if}
\ No newline at end of file
diff --git a/test/hydration/samples/raw/main.html b/test/hydration/samples/raw/main.html
index 7523dfd4de..105e9e0581 100644
--- a/test/hydration/samples/raw/main.html
+++ b/test/hydration/samples/raw/main.html
@@ -1 +1 @@
-{{{raw}}}
\ No newline at end of file
+{@html raw}
\ No newline at end of file