diff --git a/test/runtime/samples/dynamic-element-void-with-content1/_config.js b/test/runtime/samples/dynamic-element-void-with-content-1/_config.js
similarity index 100%
rename from test/runtime/samples/dynamic-element-void-with-content1/_config.js
rename to test/runtime/samples/dynamic-element-void-with-content-1/_config.js
diff --git a/test/runtime/samples/dynamic-element-void-with-content1/main.svelte b/test/runtime/samples/dynamic-element-void-with-content-1/main.svelte
similarity index 79%
rename from test/runtime/samples/dynamic-element-void-with-content1/main.svelte
rename to test/runtime/samples/dynamic-element-void-with-content-1/main.svelte
index 622e82d901..bcf3fed2c3 100644
--- a/test/runtime/samples/dynamic-element-void-with-content1/main.svelte
+++ b/test/runtime/samples/dynamic-element-void-with-content-1/main.svelte
@@ -1,5 +1,5 @@
foo
diff --git a/test/runtime/samples/dynamic-element-void-with-content2/_config.js b/test/runtime/samples/dynamic-element-void-with-content-2/_config.js
similarity index 100%
rename from test/runtime/samples/dynamic-element-void-with-content2/_config.js
rename to test/runtime/samples/dynamic-element-void-with-content-2/_config.js
diff --git a/test/runtime/samples/dynamic-element-void-with-content2/main.svelte b/test/runtime/samples/dynamic-element-void-with-content-2/main.svelte
similarity index 81%
rename from test/runtime/samples/dynamic-element-void-with-content2/main.svelte
rename to test/runtime/samples/dynamic-element-void-with-content-2/main.svelte
index 2b8c083efd..0225654545 100644
--- a/test/runtime/samples/dynamic-element-void-with-content2/main.svelte
+++ b/test/runtime/samples/dynamic-element-void-with-content-2/main.svelte
@@ -1,5 +1,5 @@
bar
diff --git a/test/runtime/samples/dynamic-element-void-with-content3/Nested.svelte b/test/runtime/samples/dynamic-element-void-with-content-3/Nested.svelte
similarity index 100%
rename from test/runtime/samples/dynamic-element-void-with-content3/Nested.svelte
rename to test/runtime/samples/dynamic-element-void-with-content-3/Nested.svelte
diff --git a/test/runtime/samples/dynamic-element-void-with-content3/_config.js b/test/runtime/samples/dynamic-element-void-with-content-3/_config.js
similarity index 100%
rename from test/runtime/samples/dynamic-element-void-with-content3/_config.js
rename to test/runtime/samples/dynamic-element-void-with-content-3/_config.js
diff --git a/test/runtime/samples/dynamic-element-void-with-content3/main.svelte b/test/runtime/samples/dynamic-element-void-with-content-3/main.svelte
similarity index 86%
rename from test/runtime/samples/dynamic-element-void-with-content3/main.svelte
rename to test/runtime/samples/dynamic-element-void-with-content-3/main.svelte
index 320f50ea91..97045e1766 100644
--- a/test/runtime/samples/dynamic-element-void-with-content3/main.svelte
+++ b/test/runtime/samples/dynamic-element-void-with-content-3/main.svelte
@@ -1,6 +1,6 @@
diff --git a/test/runtime/samples/dynamic-element-void-with-content4/Nested.svelte b/test/runtime/samples/dynamic-element-void-with-content-4/Nested.svelte
similarity index 100%
rename from test/runtime/samples/dynamic-element-void-with-content4/Nested.svelte
rename to test/runtime/samples/dynamic-element-void-with-content-4/Nested.svelte
diff --git a/test/runtime/samples/dynamic-element-void-with-content4/_config.js b/test/runtime/samples/dynamic-element-void-with-content-4/_config.js
similarity index 100%
rename from test/runtime/samples/dynamic-element-void-with-content4/_config.js
rename to test/runtime/samples/dynamic-element-void-with-content-4/_config.js
diff --git a/test/runtime/samples/dynamic-element-void-with-content4/main.svelte b/test/runtime/samples/dynamic-element-void-with-content-4/main.svelte
similarity index 86%
rename from test/runtime/samples/dynamic-element-void-with-content4/main.svelte
rename to test/runtime/samples/dynamic-element-void-with-content-4/main.svelte
index 320f50ea91..97045e1766 100644
--- a/test/runtime/samples/dynamic-element-void-with-content4/main.svelte
+++ b/test/runtime/samples/dynamic-element-void-with-content-4/main.svelte
@@ -1,6 +1,6 @@