diff --git a/test/js/samples/do-use-dataset/expected.js b/test/js/samples/data-attribute/expected.js
similarity index 100%
rename from test/js/samples/do-use-dataset/expected.js
rename to test/js/samples/data-attribute/expected.js
diff --git a/test/js/samples/do-use-dataset/input.svelte b/test/js/samples/data-attribute/input.svelte
similarity index 100%
rename from test/js/samples/do-use-dataset/input.svelte
rename to test/js/samples/data-attribute/input.svelte
diff --git a/test/js/samples/dont-use-dataset-in-legacy/_config.js b/test/js/samples/dont-use-dataset-in-legacy/_config.js
deleted file mode 100644
index 67924a4ffe..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/_config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	options: {
-		legacy: true
-	}
-};
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected.js b/test/js/samples/dont-use-dataset-in-legacy/expected.js
deleted file mode 100644
index 12ba50e69f..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/expected.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import {
-	SvelteComponent,
-	attr,
-	detach,
-	element,
-	init,
-	insert,
-	noop,
-	safe_not_equal,
-	space
-} from "svelte/internal";
-
-function create_fragment(ctx) {
-	var div0, t, div1;
-
-	return {
-		c() {
-			div0 = element("div");
-			t = space();
-			div1 = element("div");
-			attr(div0, "data-foo", "bar");
-			attr(div1, "data-foo", ctx.bar);
-		},
-
-		m(target, anchor) {
-			insert(target, div0, anchor);
-			insert(target, t, anchor);
-			insert(target, div1, anchor);
-		},
-
-		p(changed, ctx) {
-			if (changed.bar) {
-				attr(div1, "data-foo", ctx.bar);
-			}
-		},
-
-		i: noop,
-		o: noop,
-
-		d(detaching) {
-			if (detaching) {
-				detach(div0);
-				detach(t);
-				detach(div1);
-			}
-		}
-	};
-}
-
-function instance($$self, $$props, $$invalidate) {
-	let { bar } = $$props;
-
-	$$self.$set = $$props => {
-		if ('bar' in $$props) $$invalidate('bar', bar = $$props.bar);
-	};
-
-	return { bar };
-}
-
-class Component extends SvelteComponent {
-	constructor(options) {
-		super();
-		init(this, options, instance, create_fragment, safe_not_equal, ["bar"]);
-	}
-}
-
-export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-legacy/input.svelte b/test/js/samples/dont-use-dataset-in-legacy/input.svelte
deleted file mode 100644
index e340b2610f..0000000000
--- a/test/js/samples/dont-use-dataset-in-legacy/input.svelte
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-	export let bar;
-</script>
-
-<div data-foo='bar'/>
-<div data-foo='{bar}'/>
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected.js b/test/js/samples/dont-use-dataset-in-svg/expected.js
deleted file mode 100644
index 0862d1bbc6..0000000000
--- a/test/js/samples/dont-use-dataset-in-svg/expected.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import {
-	SvelteComponent,
-	append,
-	attr,
-	detach,
-	init,
-	insert,
-	noop,
-	safe_not_equal,
-	svg_element
-} from "svelte/internal";
-
-function create_fragment(ctx) {
-	var svg, g0, g1;
-
-	return {
-		c() {
-			svg = svg_element("svg");
-			g0 = svg_element("g");
-			g1 = svg_element("g");
-			attr(g0, "data-foo", "bar");
-			attr(g1, "data-foo", ctx.bar);
-		},
-
-		m(target, anchor) {
-			insert(target, svg, anchor);
-			append(svg, g0);
-			append(svg, g1);
-		},
-
-		p(changed, ctx) {
-			if (changed.bar) {
-				attr(g1, "data-foo", ctx.bar);
-			}
-		},
-
-		i: noop,
-		o: noop,
-
-		d(detaching) {
-			if (detaching) {
-				detach(svg);
-			}
-		}
-	};
-}
-
-function instance($$self, $$props, $$invalidate) {
-	let { bar } = $$props;
-
-	$$self.$set = $$props => {
-		if ('bar' in $$props) $$invalidate('bar', bar = $$props.bar);
-	};
-
-	return { bar };
-}
-
-class Component extends SvelteComponent {
-	constructor(options) {
-		super();
-		init(this, options, instance, create_fragment, safe_not_equal, ["bar"]);
-	}
-}
-
-export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/input.svelte b/test/js/samples/dont-use-dataset-in-svg/input.svelte
deleted file mode 100644
index 969377de33..0000000000
--- a/test/js/samples/dont-use-dataset-in-svg/input.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-	export let bar;
-</script>
-
-<svg>
-	<g data-foo='bar'/>
-	<g data-foo='{bar}'/>
-</svg>
\ No newline at end of file