diff --git a/test/runtime/samples/await-then-catch-order/_config.js b/test/runtime/samples/await-then-catch-order/_config.js
new file mode 100644
index 0000000000..4a8f4df77c
--- /dev/null
+++ b/test/runtime/samples/await-then-catch-order/_config.js
@@ -0,0 +1,27 @@
+let fulfil;
+
+let thePromise = new Promise(f => {
+	fulfil = f;
+});
+
+export default {
+	data: {
+		thePromise
+	},
+
+	html: `
+		<p>loading...</p><p>true!</p>
+	`,
+
+	test(assert, component, target) {
+		fulfil(42);
+
+		return thePromise
+			.then(() => {
+				assert.htmlEqual(target.innerHTML, `
+					<p>the value is 42</p><p>true!</p>
+				`);
+			});
+
+	}
+};
diff --git a/test/runtime/samples/await-then-catch-order/main.html b/test/runtime/samples/await-then-catch-order/main.html
new file mode 100644
index 0000000000..87b37bf27d
--- /dev/null
+++ b/test/runtime/samples/await-then-catch-order/main.html
@@ -0,0 +1,11 @@
+{#await thePromise}
+	<p>loading...</p>
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}</p>
+{/await}
+
+{#if true}
+	<p>true!</p>
+{/if}