diff --git a/test/runtime/samples/class-helper/_config.js b/test/runtime/samples/class-helper/_config.js
index d94cc0cdf5..497f13a182 100644
--- a/test/runtime/samples/class-helper/_config.js
+++ b/test/runtime/samples/class-helper/_config.js
@@ -2,13 +2,14 @@ export default {
 	props: {
 		user: { active: true }
 	},
+
 	html: `<div class="active"></div>`,
 
-	test ( assert, component, target, window ) {
+	test(assert, component, target, window) {
 		component.user = { active: false };
 
-		assert.htmlEqual( target.innerHTML, `
+		assert.htmlEqual(target.innerHTML, `
 			<div class></div>
-		` );
+		`);
 	}
 };
diff --git a/test/runtime/samples/class-helper/main.html b/test/runtime/samples/class-helper/main.html
index 6aecd57f6f..c25b58b7f2 100644
--- a/test/runtime/samples/class-helper/main.html
+++ b/test/runtime/samples/class-helper/main.html
@@ -6,4 +6,4 @@
 }
 </script>
 
-<div class:active="isActive(user)"></div>
\ No newline at end of file
+<div class:active={isActive(user)}></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-in-each/main.html b/test/runtime/samples/class-in-each/main.html
index ac61ce0fd9..4998de3cea 100644
--- a/test/runtime/samples/class-in-each/main.html
+++ b/test/runtime/samples/class-in-each/main.html
@@ -1,3 +1,3 @@
 {#each things as thing}
-	<div class:selected="selected === thing"></div>
+	<div class:selected="{selected === thing}"></div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/class-shortcut-with-class/_config.js b/test/runtime/samples/class-shortcut-with-class/_config.js
index 1f759c335c..9593282cdc 100644
--- a/test/runtime/samples/class-shortcut-with-class/_config.js
+++ b/test/runtime/samples/class-shortcut-with-class/_config.js
@@ -1,16 +1,17 @@
 export default {
 	props: {
-		"is-active": true,
-		isSelected: true,
+		foo: true,
+		bar: true,
 		myClass: 'one two'
 	},
-	html: `<div class="one two is-active isSelected"></div>`,
 
-	test ( assert, component, target, window ) {
-		component.undefined = false;
+	html: `<div class="one two foo bar"></div>`,
 
-		assert.htmlEqual( target.innerHTML, `
-			<div class="one two isSelected"></div>
-		` );
+	test(assert, component, target, window) {
+		component.foo = false;
+
+		assert.htmlEqual(target.innerHTML, `
+			<div class="one two bar"></div>
+		`);
 	}
 };
diff --git a/test/runtime/samples/class-shortcut-with-class/main.html b/test/runtime/samples/class-shortcut-with-class/main.html
index 0ef207e946..72c1d4f8d4 100644
--- a/test/runtime/samples/class-shortcut-with-class/main.html
+++ b/test/runtime/samples/class-shortcut-with-class/main.html
@@ -1 +1 @@
-<div class="{ myClass }" class:is-active class:isSelected class:not-used></div>
\ No newline at end of file
+<div class={myClass} class:foo class:bar class:unused></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-shortcut/_config.js b/test/runtime/samples/class-shortcut/_config.js
index 371806660f..dfc7458361 100644
--- a/test/runtime/samples/class-shortcut/_config.js
+++ b/test/runtime/samples/class-shortcut/_config.js
@@ -1,15 +1,16 @@
 export default {
 	props: {
-		"is-active": true,
-		isSelected: true
+		foo: true,
+		bar: true
 	},
-	html: `<div class="is-active isSelected"></div>`,
 
-	test ( assert, component, target, window ) {
-		component.undefined = false;
+	html: `<div class="foo bar"></div>`,
 
-		assert.htmlEqual( target.innerHTML, `
-			<div class="isSelected"></div>
-		` );
+	test(assert, component, target, window) {
+		component.foo = false;
+
+		assert.htmlEqual(target.innerHTML, `
+			<div class="bar"></div>
+		`);
 	}
 };
diff --git a/test/runtime/samples/class-shortcut/main.html b/test/runtime/samples/class-shortcut/main.html
index 7c9affa0b5..fe14d4de06 100644
--- a/test/runtime/samples/class-shortcut/main.html
+++ b/test/runtime/samples/class-shortcut/main.html
@@ -1 +1 @@
-<div class:is-active class:isSelected class:not-used></div>
\ No newline at end of file
+<div class:foo class:bar class:unused></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-with-attribute/main.html b/test/runtime/samples/class-with-attribute/main.html
index 5bf57892e9..abe0b005db 100644
--- a/test/runtime/samples/class-with-attribute/main.html
+++ b/test/runtime/samples/class-with-attribute/main.html
@@ -1 +1 @@
-<div class="one" class:two="true" class:three="true"></div>
\ No newline at end of file
+<div class="one" class:two={true} class:three={true}></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-with-dynamic-attribute/_config.js b/test/runtime/samples/class-with-dynamic-attribute/_config.js
index a1d6c5bca3..a384d5e17e 100644
--- a/test/runtime/samples/class-with-dynamic-attribute/_config.js
+++ b/test/runtime/samples/class-with-dynamic-attribute/_config.js
@@ -2,13 +2,14 @@ export default {
 	props: {
 		myClass: 'one two'
 	},
+
 	html: `<div class="one two three"></div>`,
 
-	test ( assert, component, target, window ) {
+	test(assert, component, target, window) {
 		component.myClass = 'one';
 
-		assert.htmlEqual( target.innerHTML, `
+		assert.htmlEqual(target.innerHTML, `
 			<div class="one three"></div>
-		` );
+		`);
 	}
 };
diff --git a/test/runtime/samples/class-with-dynamic-attribute/main.html b/test/runtime/samples/class-with-dynamic-attribute/main.html
index 40c293f5d5..2097c465d9 100644
--- a/test/runtime/samples/class-with-dynamic-attribute/main.html
+++ b/test/runtime/samples/class-with-dynamic-attribute/main.html
@@ -1 +1 @@
-<div class="{ myClass }" class:three="true"></div>
\ No newline at end of file
+<div class={myClass} class:three={true}></div>
\ No newline at end of file