diff --git a/test/runtime/samples/each-block-containing-component-in-if/Nested.html b/test/runtime/samples/each-block-containing-component-in-if/Nested.html
new file mode 100644
index 0000000000..b9d76a696d
--- /dev/null
+++ b/test/runtime/samples/each-block-containing-component-in-if/Nested.html
@@ -0,0 +1,5 @@
+{{#if show}}
+	{{#each fields as field}}
+		<span>{{field}}</span>
+	{{/each}}
+{{/if}}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-containing-component-in-if/_config.js b/test/runtime/samples/each-block-containing-component-in-if/_config.js
new file mode 100644
index 0000000000..bfee6beb20
--- /dev/null
+++ b/test/runtime/samples/each-block-containing-component-in-if/_config.js
@@ -0,0 +1,36 @@
+export default {
+	data: {
+		show: false,
+		fields: [1, 2]
+	},
+
+	html: `<div></div>`,
+
+	test ( assert, component, target ) {
+		component.set({
+			show: true,
+			fields: [1, 2, 3]
+		});
+
+		assert.htmlEqual( target.innerHTML, `
+			<div>
+				<span>1</span>	
+				<span>2</span>
+				<span>3</span>
+			</div>
+		` );
+
+		component.set({
+			fields: [1, 2, 3, 4]
+		});
+
+		assert.htmlEqual( target.innerHTML, `
+			<div>
+				<span>1</span>	
+				<span>2</span>
+				<span>3</span>
+				<span>4</span>
+			</div>
+		` );
+	}
+};
diff --git a/test/runtime/samples/each-block-containing-component-in-if/main.html b/test/runtime/samples/each-block-containing-component-in-if/main.html
new file mode 100644
index 0000000000..9a6bbfd10f
--- /dev/null
+++ b/test/runtime/samples/each-block-containing-component-in-if/main.html
@@ -0,0 +1,13 @@
+<div>
+	<Nested :show :fields/>
+</div>
+
+<script>
+	import Nested from './Nested.html';
+
+	export default {
+		components: {
+			Nested
+		}
+	};
+</script>
\ No newline at end of file