diff --git a/test/runtime/samples/class-with-multi-attribute/_config.js b/test/runtime/samples/class-with-multi-attribute/_config.js
new file mode 100644
index 0000000000..8657d48bde
--- /dev/null
+++ b/test/runtime/samples/class-with-multi-attribute/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: `<div class="one two three four"></div>`
+};
diff --git a/test/runtime/samples/class-with-multi-attribute/main.svelte b/test/runtime/samples/class-with-multi-attribute/main.svelte
new file mode 100644
index 0000000000..6ddc57f62a
--- /dev/null
+++ b/test/runtime/samples/class-with-multi-attribute/main.svelte
@@ -0,0 +1 @@
+<div class="one" class:two={true} class:three,four={true}></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-with-multi-dynamic-attribute-and-spread/_config.js b/test/runtime/samples/class-with-multi-dynamic-attribute-and-spread/_config.js
new file mode 100644
index 0000000000..a90c6875cc
--- /dev/null
+++ b/test/runtime/samples/class-with-multi-dynamic-attribute-and-spread/_config.js
@@ -0,0 +1,21 @@
+export default {
+	props: {
+		myClass: 'one two',
+		attributes: {
+			role: 'button'
+		}
+	},
+
+	html: `<div class="one two three four" role="button"></div>`,
+
+	test({ assert, component, target, window }) {
+		component.myClass = 'one';
+		component.attributes = {
+			'aria-label': 'Test'
+		};
+
+		assert.htmlEqual(target.innerHTML, `
+			<div class="one three four" aria-label="Test"></div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/class-with-multi-dynamic-attribute-and-spread/main.svelte b/test/runtime/samples/class-with-multi-dynamic-attribute-and-spread/main.svelte
new file mode 100644
index 0000000000..50836d8420
--- /dev/null
+++ b/test/runtime/samples/class-with-multi-dynamic-attribute-and-spread/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let myClass;
+	export let attributes = {};
+</script>
+
+<div class={myClass} class:three,four={true} {...attributes}></div>
diff --git a/test/runtime/samples/class-with-multi-dynamic-attribute/_config.js b/test/runtime/samples/class-with-multi-dynamic-attribute/_config.js
new file mode 100644
index 0000000000..a2dbb5ed53
--- /dev/null
+++ b/test/runtime/samples/class-with-multi-dynamic-attribute/_config.js
@@ -0,0 +1,15 @@
+export default {
+	props: {
+		myClass: 'one two'
+	},
+
+	html: `<div class="one two three four"></div>`,
+
+	test({ assert, component, target, window }) {
+		component.myClass = 'one';
+
+		assert.htmlEqual(target.innerHTML, `
+			<div class="one three four"></div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/class-with-multi-dynamic-attribute/main.svelte b/test/runtime/samples/class-with-multi-dynamic-attribute/main.svelte
new file mode 100644
index 0000000000..5a5403cfaf
--- /dev/null
+++ b/test/runtime/samples/class-with-multi-dynamic-attribute/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let myClass;
+</script>
+
+<div class={myClass} class:three,four={true}></div>
\ No newline at end of file