diff --git a/src/runtime/index.ts b/src/runtime/index.ts
index e890bcf..0c62478 100644
--- a/src/runtime/index.ts
+++ b/src/runtime/index.ts
@@ -133,7 +133,7 @@ function prepare_route(Page: ComponentConstructor, props: RouteData) {
 	});
 }
 
-function navigate(target: Target, id: number) {
+function navigate(target: Target, id: number): Promise<any> {
 	if (id) {
 		// popstate or initial navigation
 		cid = id;
@@ -299,13 +299,17 @@ export function init(opts: { App: ComponentConstructor, target: Node, routes: Ro
 
 export function goto(href: string, opts = { replaceState: false }) {
 	const target = select_route(new URL(href, document.baseURI));
+	let promise;
 
 	if (target) {
-		navigate(target, null);
+		promise = navigate(target, null);
 		if (history) history[opts.replaceState ? 'replaceState' : 'pushState']({ id: cid }, '', href);
 	} else {
 		window.location.href = href;
+		promise = new Promise(f => {}); // never resolves
 	}
+
+	return promise;
 }
 
 export function prefetchRoutes(pathnames: string[]) {
diff --git a/test/app/routes/about.html b/test/app/routes/about.html
index 605e0db..65ebb57 100644
--- a/test/app/routes/about.html
+++ b/test/app/routes/about.html
@@ -6,15 +6,21 @@
 
 <p>This is the 'about' page. There's not much here.</p>
 
-<button class='goto' on:click='goto("blog/what-is-sapper")'>What is Sapper?</button>
 <button class='prefetch' on:click='prefetch("blog/why-the-name")'>Why the name?</button>
 
 <script>
 	import { goto, prefetch } from '../../../runtime.js';
 
 	export default {
+		oncreate() {
+			window.goto = goto;
+		},
+
+		ondestroy() {
+			window.goto = null;
+		},
+
 		methods: {
-			goto,
 			prefetch
 		}
 	};
diff --git a/test/common/test.js b/test/common/test.js
index 3c637eb..d4449fb 100644
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -281,9 +281,7 @@ function run({ mode, basepath = '' }) {
 				return nightmare
 					.goto(`${base}/about`)
 					.init()
-					.click('.goto')
-					.wait(url => window.location.pathname === url, `${basepath}/blog/what-is-sapper`)
-					.wait(100)
+					.evaluate(() => window.goto('blog/what-is-sapper'))
 					.title()
 					.then(title => {
 						assert.equal(title, 'What is Sapper?');