diff --git a/test/js/samples/variable-declaration-in-switch-case/expected.js b/test/js/samples/variable-declaration-in-switch-case/expected.js
new file mode 100644
index 0000000000..71fbab6a34
--- /dev/null
+++ b/test/js/samples/variable-declaration-in-switch-case/expected.js
@@ -0,0 +1,20 @@
+/* generated by Svelte vX.Y.Z */
+import { SvelteComponent, init, safe_not_equal } from "svelte/internal";
+
+function instance($$self) {
+	switch (1) {
+		case 1:
+			const value = Math.random();
+	}
+
+	return [];
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, instance, null, safe_not_equal, {});
+	}
+}
+
+export default Component;
diff --git a/test/js/samples/variable-declaration-in-switch-case/input.svelte b/test/js/samples/variable-declaration-in-switch-case/input.svelte
new file mode 100644
index 0000000000..bef86a4967
--- /dev/null
+++ b/test/js/samples/variable-declaration-in-switch-case/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	switch (1) {
+		case 1:
+			const value = Math.random();
+	}
+</script>
+
diff --git a/test/runtime/samples/variable-declarations-in-switch-no-brackets/_config.js b/test/runtime/samples/variable-declarations-in-switch-no-brackets/_config.js
new file mode 100644
index 0000000000..66462fd9fd
--- /dev/null
+++ b/test/runtime/samples/variable-declarations-in-switch-no-brackets/_config.js
@@ -0,0 +1,16 @@
+export default {
+  props: {
+    q: 0 
+  },
+
+  html: '<p>3</p>',
+
+  test({ assert, component, target }) {
+    component.q = 1;
+    assert.htmlEqual(target.innerHTML, '<p>4</p>');
+    component.q = 2;
+    assert.htmlEqual(target.innerHTML, '<p>5</p>');
+    component.q = 3;
+    assert.htmlEqual(target.innerHTML, '<p>6</p>');
+  }
+};
diff --git a/test/runtime/samples/variable-declarations-in-switch-no-brackets/main.svelte b/test/runtime/samples/variable-declarations-in-switch-no-brackets/main.svelte
new file mode 100644
index 0000000000..04ed9d827d
--- /dev/null
+++ b/test/runtime/samples/variable-declarations-in-switch-no-brackets/main.svelte
@@ -0,0 +1,25 @@
+<script>
+	export let q;
+	let p = 3;
+	$: {
+    switch (q) {
+		  case 1:
+		    let value = Math.floor(Math.random()); // gives 0
+			  p = 4 + value;
+			  break;
+		  case 2:
+		    var number = Math.ceil(Math.random()); // gives 1
+		    p = 4 + number;
+		    break;
+		  case 3:
+		    const foo = 2; // gives 2
+		    p = 4 + foo;
+        break;
+    }
+  }
+</script>
+
+<p>
+	{p}
+</p>
+