diff --git a/test/runtime/samples/binding-select-in-yield/Modal.html b/test/runtime/samples/binding-select-in-yield/Modal.html
new file mode 100644
index 0000000000..53ec5fb2cb
--- /dev/null
+++ b/test/runtime/samples/binding-select-in-yield/Modal.html
@@ -0,0 +1,20 @@
+{{#if !hidden}}
+	{{ yield }}
+{{/if}}
+
+<script>
+	export default {
+		data () {
+			return {
+				hidden: true
+			};
+		},
+		methods: {
+			toggle () {
+				this.set({
+					hidden: !this.get('hidden')
+				});
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-in-yield/_config.js b/test/runtime/samples/binding-select-in-yield/_config.js
new file mode 100644
index 0000000000..e8ef296a33
--- /dev/null
+++ b/test/runtime/samples/binding-select-in-yield/_config.js
@@ -0,0 +1,52 @@
+export default {
+	html: ``,
+
+	data: {
+		letter: 'b'
+	},
+
+	test ( assert, component, target, window ) {
+		component.refs.modal.toggle();
+
+		assert.htmlEqual(target.innerHTML, `
+			<span>b</span>
+
+			<select>
+				<option value='a'>a</option>
+				<option value='b'>b</option>
+				<option value='c'>c</option>
+			</select>
+		`);
+
+		const select = target.querySelector('select');
+		const change = new window.MouseEvent('change');
+
+		select.options[2].selected = true;
+		select.dispatchEvent(change);
+
+		assert.htmlEqual(target.innerHTML, `
+			<span>c</span>
+
+			<select>
+				<option value='a'>a</option>
+				<option value='b'>b</option>
+				<option value='c'>c</option>
+			</select>
+		`);
+
+		component.refs.modal.toggle();
+		component.refs.modal.toggle();
+
+		assert.ok(select.options[2].selected);
+
+		assert.htmlEqual(target.innerHTML, `
+			<span>c</span>
+
+			<select>
+				<option value='a'>a</option>
+				<option value='b'>b</option>
+				<option value='c'>c</option>
+			</select>
+		`);
+	}
+};
diff --git a/test/runtime/samples/binding-select-in-yield/main.html b/test/runtime/samples/binding-select-in-yield/main.html
new file mode 100644
index 0000000000..6ed86dc288
--- /dev/null
+++ b/test/runtime/samples/binding-select-in-yield/main.html
@@ -0,0 +1,23 @@
+<Modal ref:modal>
+	<span>{{letter}}</span>
+	<select bind:value='letter'>
+		{{#each letters as letter}}
+			<option value="{{letter}}">{{letter}}</option>
+		{{/each}}
+	</select>
+</Modal>
+
+<script>
+	import Modal from './Modal.html';
+
+	export default {
+		data () {
+			return {
+				letters: ['a', 'b', 'c']
+			};
+		},
+		components: {
+			Modal
+		}
+	};
+</script>
\ No newline at end of file