diff --git a/test/generator/component-binding-each-nested/Widget.html b/test/generator/component-binding-each-nested/Widget.html
new file mode 100644
index 0000000000..f24d608cd5
--- /dev/null
+++ b/test/generator/component-binding-each-nested/Widget.html
@@ -0,0 +1 @@
+<input bind:value>
\ No newline at end of file
diff --git a/test/generator/component-binding-each-nested/_config.js b/test/generator/component-binding-each-nested/_config.js
new file mode 100644
index 0000000000..c25c9cf803
--- /dev/null
+++ b/test/generator/component-binding-each-nested/_config.js
@@ -0,0 +1,28 @@
+export default {
+	html: `
+		<input>
+		<input>
+		<input>
+		
+		<p>foo, bar, baz</p>
+	`,
+
+	test ( assert, component, target, window ) {
+		const change = new window.MouseEvent( 'change' );
+		const inputs = target.querySelectorAll( 'input' );
+
+		inputs[0].value = 'blah';
+		inputs[0].dispatchEvent( change );
+
+		assert.deepEqual( component.get( 'a' ), [ 'blah', 'bar', 'baz' ] );
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<input>
+			<input>
+			
+			<p>blah, bar, baz</p>
+		` );
+		
+		component.teardown();
+	}
+};
diff --git a/test/generator/component-binding-each-nested/main.html b/test/generator/component-binding-each-nested/main.html
new file mode 100644
index 0000000000..bdda96fe75
--- /dev/null
+++ b/test/generator/component-binding-each-nested/main.html
@@ -0,0 +1,22 @@
+{{#each a as x}}
+	<Widget bind:value='x.name'/>
+{{/each}}
+
+<p>{{a.map(getName).join(', ')}}</p>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		data () {
+			return {
+				a: [{ name: 'foo' }, { name: 'bar' }, { name: 'baz' }],
+				getName: x => x.name
+			};
+		},
+
+		components: {
+			Widget
+		}
+	};
+</script>
diff --git a/test/generator/component-binding-each/Widget.html b/test/generator/component-binding-each/Widget.html
new file mode 100644
index 0000000000..f24d608cd5
--- /dev/null
+++ b/test/generator/component-binding-each/Widget.html
@@ -0,0 +1 @@
+<input bind:value>
\ No newline at end of file
diff --git a/test/generator/component-binding-each/_config.js b/test/generator/component-binding-each/_config.js
new file mode 100644
index 0000000000..c25c9cf803
--- /dev/null
+++ b/test/generator/component-binding-each/_config.js
@@ -0,0 +1,28 @@
+export default {
+	html: `
+		<input>
+		<input>
+		<input>
+		
+		<p>foo, bar, baz</p>
+	`,
+
+	test ( assert, component, target, window ) {
+		const change = new window.MouseEvent( 'change' );
+		const inputs = target.querySelectorAll( 'input' );
+
+		inputs[0].value = 'blah';
+		inputs[0].dispatchEvent( change );
+
+		assert.deepEqual( component.get( 'a' ), [ 'blah', 'bar', 'baz' ] );
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<input>
+			<input>
+			
+			<p>blah, bar, baz</p>
+		` );
+		
+		component.teardown();
+	}
+};
diff --git a/test/generator/component-binding-each/main.html b/test/generator/component-binding-each/main.html
new file mode 100644
index 0000000000..6dbae7e403
--- /dev/null
+++ b/test/generator/component-binding-each/main.html
@@ -0,0 +1,21 @@
+{{#each a as x}}
+	<Widget bind:value='x'/>
+{{/each}}
+
+<p>{{a.join(', ')}}</p>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		data () {
+			return {
+				a: [ 'foo', 'bar', 'baz' ]
+			};
+		},
+
+		components: {
+			Widget
+		}
+	};
+</script>