diff --git a/test/generator/component-events-each/Widget.html b/test/generator/component-events-each/Widget.html
new file mode 100644
index 0000000000..ad81b51f15
--- /dev/null
+++ b/test/generator/component-events-each/Widget.html
@@ -0,0 +1 @@
+<button on:click='fire("foo")'>click me</button>
diff --git a/test/generator/component-events-each/_config.js b/test/generator/component-events-each/_config.js
new file mode 100644
index 0000000000..25635556a0
--- /dev/null
+++ b/test/generator/component-events-each/_config.js
@@ -0,0 +1,27 @@
+export default {
+	data: {
+		items: [ 'a', 'b', 'c' ]
+	},
+
+	html: `
+		<div><button>click me</button><button>click me</button><button>click me</button></div>
+	`,
+
+	test ( assert, component, target, window ) {
+		const buttons = target.querySelectorAll( 'button' );
+
+		const clicks = [];
+
+		component.on( 'foo', item => {
+			clicks.push( item );
+		});
+
+		const event = new window.MouseEvent( 'click' );
+
+		buttons[0].dispatchEvent( event );
+		buttons[2].dispatchEvent( event );
+
+		assert.deepEqual( clicks, [ 'a', 'c' ]);
+		component.teardown();
+	}
+};
diff --git a/test/generator/component-events-each/main.html b/test/generator/component-events-each/main.html
new file mode 100644
index 0000000000..e429f3f303
--- /dev/null
+++ b/test/generator/component-events-each/main.html
@@ -0,0 +1,19 @@
+<div>
+	{{#each items as item}}
+		<Widget on:foo='foo(item)'/>
+	{{/each}}
+</div>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		components: { Widget },
+
+		methods: {
+			foo ( item ) {
+				this.fire( 'foo', item );
+			}
+		}
+	};
+</script>