diff --git a/test/runtime/samples/var-in-do-while-block/_config.js b/test/runtime/samples/var-in-do-while-block/_config.js
new file mode 100644
index 0000000000..1ba2c535ec
--- /dev/null
+++ b/test/runtime/samples/var-in-do-while-block/_config.js
@@ -0,0 +1,7 @@
+export default {
+  props: {
+    a: 13 
+  },
+
+  html: '<p>169</p>'
+};
diff --git a/test/runtime/samples/var-in-do-while-block/main.svelte b/test/runtime/samples/var-in-do-while-block/main.svelte
new file mode 100644
index 0000000000..cb4d4ff93e
--- /dev/null
+++ b/test/runtime/samples/var-in-do-while-block/main.svelte
@@ -0,0 +1,9 @@
+<script>
+  export let a;
+  let i = 0; 
+  do {
+    var b = a * i;
+  } while (++i <= a);
+</script>
+
+<p>{b}</p>
diff --git a/test/runtime/samples/var-store-in-do-while-loop/_config.js b/test/runtime/samples/var-store-in-do-while-loop/_config.js
new file mode 100644
index 0000000000..59ee78d297
--- /dev/null
+++ b/test/runtime/samples/var-store-in-do-while-loop/_config.js
@@ -0,0 +1,3 @@
+export default {
+  html: '<p>3</p><p>5</p>'
+};
diff --git a/test/runtime/samples/var-store-in-do-while-loop/main.svelte b/test/runtime/samples/var-store-in-do-while-loop/main.svelte
new file mode 100644
index 0000000000..22eb676fc1
--- /dev/null
+++ b/test/runtime/samples/var-store-in-do-while-loop/main.svelte
@@ -0,0 +1,15 @@
+<script>
+  import { writable } from "svelte/store";
+
+  do {
+    var a = writable(3); 
+  } while (false);
+
+  do var b = writable(5); while (false);
+
+  var x = $a;
+  var y = $b;
+</script>
+
+<p>{x}</p>
+<p>{y}</p>
diff --git a/test/runtime/samples/var-store-in-for-loop/_config.js b/test/runtime/samples/var-store-in-for-loop/_config.js
new file mode 100644
index 0000000000..59ee78d297
--- /dev/null
+++ b/test/runtime/samples/var-store-in-for-loop/_config.js
@@ -0,0 +1,3 @@
+export default {
+  html: '<p>3</p><p>5</p>'
+};
diff --git a/test/runtime/samples/var-store-in-for-loop/main.svelte b/test/runtime/samples/var-store-in-for-loop/main.svelte
new file mode 100644
index 0000000000..21b8beed20
--- /dev/null
+++ b/test/runtime/samples/var-store-in-for-loop/main.svelte
@@ -0,0 +1,16 @@
+<script>
+  import { writable } from "svelte/store";
+
+  for (let i = 0; i < 1; i += 1) {
+    var a = writable(3);
+  }
+
+  for (let i = 0; i < 1; i += 1)
+    var b = writable(5);
+
+  var x = $a;
+  var y = $b;
+</script>
+
+<p>{x}</p>
+<p>{y}</p>
diff --git a/test/runtime/samples/var-store-in-if/_config.js b/test/runtime/samples/var-store-in-if/_config.js
new file mode 100644
index 0000000000..59ee78d297
--- /dev/null
+++ b/test/runtime/samples/var-store-in-if/_config.js
@@ -0,0 +1,3 @@
+export default {
+  html: '<p>3</p><p>5</p>'
+};
diff --git a/test/runtime/samples/var-store-in-if/main.svelte b/test/runtime/samples/var-store-in-if/main.svelte
new file mode 100644
index 0000000000..e652968a79
--- /dev/null
+++ b/test/runtime/samples/var-store-in-if/main.svelte
@@ -0,0 +1,20 @@
+<script>
+  import { writable } from "svelte/store";
+
+  if (true) {
+    var a = writable(3);
+  } else {
+		var a = writable(4);
+	}
+
+  if (false)
+    var b = writable(2);
+	else
+		var b = writable(5);
+
+  var x = $a;
+  var y = $b;
+</script>
+
+<p>{x}</p>
+<p>{y}</p>
diff --git a/test/runtime/samples/var-store-in-labeled-statement/_config.js b/test/runtime/samples/var-store-in-labeled-statement/_config.js
new file mode 100644
index 0000000000..59ee78d297
--- /dev/null
+++ b/test/runtime/samples/var-store-in-labeled-statement/_config.js
@@ -0,0 +1,3 @@
+export default {
+  html: '<p>3</p><p>5</p>'
+};
diff --git a/test/runtime/samples/var-store-in-labeled-statement/main.svelte b/test/runtime/samples/var-store-in-labeled-statement/main.svelte
new file mode 100644
index 0000000000..1e28bea21d
--- /dev/null
+++ b/test/runtime/samples/var-store-in-labeled-statement/main.svelte
@@ -0,0 +1,15 @@
+<script>
+  import { writable } from "svelte/store";
+
+	yes: {
+	  var a = writable(3);
+  }
+
+  no: var b = writable(5);
+
+  var x = $a;
+  var y = $b;
+</script>
+
+<p>{x}</p>
+<p>{y}</p>
diff --git a/test/runtime/samples/var-store-in-switch-statement/_config.js b/test/runtime/samples/var-store-in-switch-statement/_config.js
new file mode 100644
index 0000000000..59ee78d297
--- /dev/null
+++ b/test/runtime/samples/var-store-in-switch-statement/_config.js
@@ -0,0 +1,3 @@
+export default {
+  html: '<p>3</p><p>5</p>'
+};
diff --git a/test/runtime/samples/var-store-in-switch-statement/main.svelte b/test/runtime/samples/var-store-in-switch-statement/main.svelte
new file mode 100644
index 0000000000..951b118fc7
--- /dev/null
+++ b/test/runtime/samples/var-store-in-switch-statement/main.svelte
@@ -0,0 +1,39 @@
+<script>
+  import { writable } from "svelte/store";
+	
+	const val1 = 1;
+	const val2 = 10;
+
+	switch (val1) {
+		case 1:
+			var a = writable(3);
+			break;
+		case 2:
+			var a = writable(4);
+			break;
+		default:
+			var a = writable(5);
+			break;
+	}
+
+	switch (val2) {
+		case 1: {
+			var b = writable(3);
+			break;
+		}
+		case 2: {
+			var b = writable(4);
+			break;
+		}
+		default: {
+			var b = writable(5);
+			break;
+		}
+	}
+
+  var x = $a;
+  var y = $b;
+</script>
+
+<p>{x}</p>
+<p>{y}</p>
diff --git a/test/runtime/samples/var-store-in-while-loop/_config.js b/test/runtime/samples/var-store-in-while-loop/_config.js
new file mode 100644
index 0000000000..59ee78d297
--- /dev/null
+++ b/test/runtime/samples/var-store-in-while-loop/_config.js
@@ -0,0 +1,3 @@
+export default {
+  html: '<p>3</p><p>5</p>'
+};
diff --git a/test/runtime/samples/var-store-in-while-loop/main.svelte b/test/runtime/samples/var-store-in-while-loop/main.svelte
new file mode 100644
index 0000000000..9621d4c684
--- /dev/null
+++ b/test/runtime/samples/var-store-in-while-loop/main.svelte
@@ -0,0 +1,16 @@
+<script>
+  import { writable } from "svelte/store";
+
+  while (!a) {
+    var a = writable(3);
+  }
+
+  while (!b)
+    var b = writable(5);
+
+  var x = $a;
+  var y = $b;
+</script>
+
+<p>{x}</p>
+<p>{y}</p>