diff --git a/test/custom-elements/samples/dispatch/main.svelte b/test/custom-elements/samples/dispatch/main.svelte
index 540e549592..30e6633db2 100644
--- a/test/custom-elements/samples/dispatch/main.svelte
+++ b/test/custom-elements/samples/dispatch/main.svelte
@@ -3,12 +3,14 @@
 
 	const dispatch = createEventDispatcher();
 
-	const handleChange = evt => {
-		dispatch('change', evt);
+	const sayHello = () => {
+		dispatch('message', {
+      text: 'Hello!'
+    });
 	};
 </script>
 
 <svelte:options tag="custom-element" />
-<label>
-	<input type="checkbox" on:change={handleChange} />
-</label>
+<button on:click={sayHello}>
+	Click to say hello
+</button>
diff --git a/test/custom-elements/samples/dispatch/test.js b/test/custom-elements/samples/dispatch/test.js
index 698e74e397..f301bb15bc 100644
--- a/test/custom-elements/samples/dispatch/test.js
+++ b/test/custom-elements/samples/dispatch/test.js
@@ -1,23 +1,24 @@
 import * as assert from 'assert';
 import './main.svelte';
 
-console.log('console.log');
-
 export default async function(target) {
 	target.innerHTML = '<custom-element></custom-element>';
 	const el = target.querySelector('custom-element');
-	const label = el.shadowRoot.querySelector('label');
-	const input = el.shadowRoot.querySelector('input');
+	const button = el.shadowRoot.querySelector('button');
 
-	return new Promise(resolve => {
-		el.addEventListener('change', function changeHandler(evt) {
-			el.removeEventListener('change', changeHandler);
+	return new Promise((resolve, reject) => {
+		el.addEventListener('message', function changeHandler(evt) {
+			el.removeEventListener('message', changeHandler);
 
-			assert.equal(evt.target, el);
-			assert.equal(input.checked, true);
-			resolve();
+      try {
+        assert.equal(evt.target, el);
+        assert.equal(evt.detail.text, 'Hello!');
+        resolve();
+      } catch (err) {
+        reject(err);
+      }
 		});
 
-		label.dispatchEvent(new MouseEvent('click'));
+		button.dispatchEvent(new MouseEvent('click'));
 	});
 }