diff --git a/test/runtime/samples/attribute-null-classname-with-style/_config.js b/test/runtime/samples/attribute-null-classname-with-style/_config.js
index 3ebc593b5d..a52afa82db 100644
--- a/test/runtime/samples/attribute-null-classname-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-classname-with-style/_config.js
@@ -1,40 +1,39 @@
 export default {
-	html: `<div class=" svelte-x1o6ra"></div>`,
-
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
 
 		component.testName = null;
-		assert.equal(div.className, ' svelte-x1o6ra');
+		const startsWith = (str) => assert.ok(div.className.startsWith(str));
+		startsWith(' svelte-');
 
 		component.testName = undefined;
-		assert.equal(div.className, ' svelte-x1o6ra');
+		startsWith(' svelte-');
 
 		component.testName = undefined + '';
-		assert.equal(div.className, 'undefined svelte-x1o6ra');
+		startsWith('undefined svelte-');
 
 		component.testName = null + '';
-		assert.equal(div.className, 'null svelte-x1o6ra');
+		startsWith('null svelte-');
 
 		component.testName = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		startsWith('1 svelte-');
 
 		component.testName = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		startsWith('0 svelte-');
 
 		component.testName = false;
-		assert.equal(div.className, 'false svelte-x1o6ra');
+		startsWith('false svelte-');
 
 		component.testName = true;
-		assert.equal(div.className, 'true svelte-x1o6ra');
+		startsWith('true svelte-');
 
 		component.testName = {};
-		assert.equal(div.className, '[object Object] svelte-x1o6ra');
+		startsWith('[object Object] svelte-');
 
 		component.testName = '';
-		assert.equal(div.className, ' svelte-x1o6ra');
+		startsWith(' svelte-');
 
 		component.testName = 'testClassName';
-		assert.equal(div.className, 'testClassName svelte-x1o6ra');
-	}
+		startsWith('testClassName svelte-');
+	},
 };
diff --git a/test/runtime/samples/attribute-null-classnames-with-style/_config.js b/test/runtime/samples/attribute-null-classnames-with-style/_config.js
index 5762f628fb..1c48e05744 100644
--- a/test/runtime/samples/attribute-null-classnames-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-classnames-with-style/_config.js
@@ -1,45 +1,43 @@
 export default {
 	props: {
-		testName1: "test1",
-		testName2: "test2",
+		testName1: 'test1',
+		testName2: 'test2',
 	},
-
-	html: `<div class="test1test2 svelte-x1o6ra"></div>`,
-
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
-		assert.equal(div.className, 'test1test2 svelte-x1o6ra');
+		const startsWith = (str) => assert.ok(div.className.startsWith(str + ' svelte-'));
+		startsWith('test1test2');
 
 		component.testName1 = null;
 		component.testName2 = null;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		startsWith('0');
 
 		component.testName1 = null;
-		component.testName2 = "test";
-		assert.equal(div.className, 'nulltest svelte-x1o6ra');
+		component.testName2 = 'test';
+		startsWith('nulltest');
 
 		component.testName1 = undefined;
-		component.testName2 = "test";
-		assert.equal(div.className, 'undefinedtest svelte-x1o6ra');
+		component.testName2 = 'test';
+		startsWith('undefinedtest');
 
 		component.testName1 = undefined;
 		component.testName2 = undefined;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		startsWith('NaN');
 
 		component.testName1 = null;
 		component.testName2 = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		startsWith('1');
 
 		component.testName1 = undefined;
 		component.testName2 = 1;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		startsWith('NaN');
 
 		component.testName1 = null;
 		component.testName2 = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		startsWith('0');
 
 		component.testName1 = undefined;
 		component.testName2 = 0;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
-	}
+		startsWith('NaN');
+	},
 };
diff --git a/test/runtime/samples/attribute-null-func-classname-with-style/_config.js b/test/runtime/samples/attribute-null-func-classname-with-style/_config.js
index 1ed43d05b9..e3732fa24c 100644
--- a/test/runtime/samples/attribute-null-func-classname-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-func-classname-with-style/_config.js
@@ -1,42 +1,40 @@
 export default {
 	props: {
-		testName: "testClassName"
+		testName: 'testClassName',
 	},
-
-	html: `<div class="testClassName svelte-x1o6ra"></div>`,
-
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
-		assert.equal(div.className, 'testClassName svelte-x1o6ra');
+		const startsWith = (str) => assert.ok(div.className.startsWith(str + ' svelte-'));
+		startsWith('testClassName');
 
 		component.testName = null;
-		assert.equal(div.className, ' svelte-x1o6ra');
+		startsWith('');
 
 		component.testName = undefined;
-		assert.equal(div.className, ' svelte-x1o6ra');
+		startsWith('');
 
 		component.testName = undefined + '';
-		assert.equal(div.className, 'undefined svelte-x1o6ra');
+		startsWith('undefined');
 
 		component.testName = null + '';
-		assert.equal(div.className, 'null svelte-x1o6ra');
+		startsWith('null');
 
 		component.testName = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		startsWith('1');
 
 		component.testName = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		startsWith('0');
 
 		component.testName = false;
-		assert.equal(div.className, 'false svelte-x1o6ra');
+		startsWith('false');
 
 		component.testName = true;
-		assert.equal(div.className, 'true svelte-x1o6ra');
+		startsWith('true');
 
 		component.testName = {};
-		assert.equal(div.className, '[object Object] svelte-x1o6ra');
+		startsWith('[object Object]');
 
 		component.testName = '';
-		assert.equal(div.className, ' svelte-x1o6ra');
-	}
+		startsWith('');
+	},
 };
diff --git a/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js b/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js
index 5762f628fb..1c48e05744 100644
--- a/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js
@@ -1,45 +1,43 @@
 export default {
 	props: {
-		testName1: "test1",
-		testName2: "test2",
+		testName1: 'test1',
+		testName2: 'test2',
 	},
-
-	html: `<div class="test1test2 svelte-x1o6ra"></div>`,
-
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
-		assert.equal(div.className, 'test1test2 svelte-x1o6ra');
+		const startsWith = (str) => assert.ok(div.className.startsWith(str + ' svelte-'));
+		startsWith('test1test2');
 
 		component.testName1 = null;
 		component.testName2 = null;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		startsWith('0');
 
 		component.testName1 = null;
-		component.testName2 = "test";
-		assert.equal(div.className, 'nulltest svelte-x1o6ra');
+		component.testName2 = 'test';
+		startsWith('nulltest');
 
 		component.testName1 = undefined;
-		component.testName2 = "test";
-		assert.equal(div.className, 'undefinedtest svelte-x1o6ra');
+		component.testName2 = 'test';
+		startsWith('undefinedtest');
 
 		component.testName1 = undefined;
 		component.testName2 = undefined;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		startsWith('NaN');
 
 		component.testName1 = null;
 		component.testName2 = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		startsWith('1');
 
 		component.testName1 = undefined;
 		component.testName2 = 1;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		startsWith('NaN');
 
 		component.testName1 = null;
 		component.testName2 = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		startsWith('0');
 
 		component.testName1 = undefined;
 		component.testName2 = 0;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
-	}
+		startsWith('NaN');
+	},
 };