diff --git a/test/runtime/samples/action-custom-event-handler-in-each-destructured/_config.js b/test/runtime/samples/action-custom-event-handler-in-each-destructured/_config.js
index 5ddf16c72d..1ea8d254d2 100644
--- a/test/runtime/samples/action-custom-event-handler-in-each-destructured/_config.js
+++ b/test/runtime/samples/action-custom-event-handler-in-each-destructured/_config.js
@@ -8,12 +8,12 @@ export default {
 		<p>second: </p>
 	`,
 
-	test(assert, component, target, window) {
+	async test(assert, component, target, window) {
 		const event = new window.MouseEvent('click');
 
 		const buttons = target.querySelectorAll('button');
 
-		buttons[1].dispatchEvent(event);
+		await buttons[1].dispatchEvent(event);
 
 		assert.htmlEqual(target.innerHTML, `
 			<button>0: foo</button>
diff --git a/test/runtime/samples/action-custom-event-handler-in-each-destructured/main.html b/test/runtime/samples/action-custom-event-handler-in-each-destructured/main.html
index b5c13cf0d8..a83d3041e6 100644
--- a/test/runtime/samples/action-custom-event-handler-in-each-destructured/main.html
+++ b/test/runtime/samples/action-custom-event-handler-in-each-destructured/main.html
@@ -21,7 +21,7 @@
 </script>
 
 {#each items as [item0, item1]}
-	<button use:tap='{() => first = item0, second = item1}'>
+	<button use:tap='{() => (first = item0, second = item1)}'>
 		{item0}: {item1}
 	</button>
 {/each}
diff --git a/test/runtime/samples/action-custom-event-handler-in-each/_config.js b/test/runtime/samples/action-custom-event-handler-in-each/_config.js
index 38523136a5..976f2e4da4 100644
--- a/test/runtime/samples/action-custom-event-handler-in-each/_config.js
+++ b/test/runtime/samples/action-custom-event-handler-in-each/_config.js
@@ -8,12 +8,12 @@ export default {
 		<p>fromState: </p>
 	`,
 
-	test(assert, component, target, window) {
+	async test(assert, component, target, window) {
 		const event = new window.MouseEvent('click');
 
 		const buttons = target.querySelectorAll('button');
 
-		buttons[1].dispatchEvent(event);
+		await buttons[1].dispatchEvent(event);
 
 		assert.htmlEqual(target.innerHTML, `
 			<button>foo</button>
diff --git a/test/runtime/samples/action-custom-event-handler-in-each/main.html b/test/runtime/samples/action-custom-event-handler-in-each/main.html
index 0bae23f0f1..db684a0bd7 100644
--- a/test/runtime/samples/action-custom-event-handler-in-each/main.html
+++ b/test/runtime/samples/action-custom-event-handler-in-each/main.html
@@ -6,22 +6,18 @@
 	export let y = 0;
 
 	function tap(node, callback) {
-		function clickHandler(event) {
-			callback();
-		}
-
-		node.addEventListener('click', clickHandler, false);
+		node.addEventListener('click', callback, false);
 
 		return {
 			destroy() {
-				node.addEventListener('click', clickHandler, false);
+				node.addEventListener('click', callback, false);
 			}
 		};
 	}
 </script>
 
 {#each items as item}
-	<button use:tap='{() => fromDom = this.textContent, fromState = item}'>{item}</button>
+	<button use:tap='{e => (fromDom = e.target.textContent, fromState = item)}'>{item}</button>
 {/each}
 
 <p>fromDom: {fromDom}</p>
diff --git a/test/runtime/samples/action-custom-event-handler-this/main.html b/test/runtime/samples/action-custom-event-handler-this/main.html
index f6ad1ea443..a7347cdc99 100644
--- a/test/runtime/samples/action-custom-event-handler-this/main.html
+++ b/test/runtime/samples/action-custom-event-handler-this/main.html
@@ -2,7 +2,7 @@
 	function enter(node, callback) {
 		function handleKeydown(event) {
 			if (event.which === 13) {
-				callback();
+				callback(event);
 			}
 		}
 
@@ -16,4 +16,4 @@
 	}
 </script>
 
-<input use:enter='{() => event.target.blur()}'>
\ No newline at end of file
+<input use:enter='{e => e.target.blur()}'>
\ No newline at end of file
diff --git a/test/runtime/samples/action-custom-event-handler/_config.js b/test/runtime/samples/action-custom-event-handler/_config.js
index 1c39ae1341..13d9be4151 100644
--- a/test/runtime/samples/action-custom-event-handler/_config.js
+++ b/test/runtime/samples/action-custom-event-handler/_config.js
@@ -1,7 +1,7 @@
 export default {
 	html: '<button>0, 0</button>',
 
-	test(assert, component, target, window) {
+	async test(assert, component, target, window) {
 		const event = new window.MouseEvent('click', {
 			clientX: 42,
 			clientY: 42
@@ -9,7 +9,7 @@ export default {
 
 		const button = target.querySelector('button');
 
-		button.dispatchEvent(event);
+		await button.dispatchEvent(event);
 
 		assert.equal(target.innerHTML, '<button>42, 42</button>');
 	}