6 files changed, 17 insertions, 17 deletions
diff --git a/tests/wasm/chan_test.go b/tests/wasm/chan_test.go
index fe981974c..c22410f63 100644
--- a/tests/wasm/chan_test.go
+++ b/tests/wasm/chan_test.go
@@ -15,8 +15,7 @@ func TestChan(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx()
-	defer cancel()
+	ctx := chromectx(t)
 
 	err = chromedp.Run(ctx,
 		chromedp.Navigate(server.URL+"/run?file=chan.wasm"),
diff --git a/tests/wasm/event_test.go b/tests/wasm/event_test.go
index a29a01c7e..5dabc707c 100644
--- a/tests/wasm/event_test.go
+++ b/tests/wasm/event_test.go
@@ -15,8 +15,7 @@ func TestEvent(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx()
-	defer cancel()
+	ctx := chromectx(t)
 
 	var log1, log2 string
 	err = chromedp.Run(ctx,
diff --git a/tests/wasm/fmt_test.go b/tests/wasm/fmt_test.go
index d3695f072..cb88e36db 100644
--- a/tests/wasm/fmt_test.go
+++ b/tests/wasm/fmt_test.go
@@ -15,8 +15,7 @@ func TestFmt(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx()
-	defer cancel()
+	ctx := chromectx(t)
 
 	var log1 string
 	err = chromedp.Run(ctx,
diff --git a/tests/wasm/fmtprint_test.go b/tests/wasm/fmtprint_test.go
index 3c7502399..ec83c77ff 100644
--- a/tests/wasm/fmtprint_test.go
+++ b/tests/wasm/fmtprint_test.go
@@ -15,8 +15,7 @@ func TestFmtprint(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx()
-	defer cancel()
+	ctx := chromectx(t)
 
 	var log1 string
 	err = chromedp.Run(ctx,
diff --git a/tests/wasm/log_test.go b/tests/wasm/log_test.go
index 1f6c79fe9..ac747431a 100644
--- a/tests/wasm/log_test.go
+++ b/tests/wasm/log_test.go
@@ -15,8 +15,7 @@ func TestLog(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx()
-	defer cancel()
+	ctx := chromectx(t)
 
 	var log1 string
 	err = chromedp.Run(ctx,
diff --git a/tests/wasm/setup_test.go b/tests/wasm/setup_test.go
index e5a18daf7..b56b6f336 100644
--- a/tests/wasm/setup_test.go
+++ b/tests/wasm/setup_test.go
@@ -32,16 +32,21 @@ func runargs(t *testing.T, args ...string) error {
 	return nil
 }
 
-func chromectx() (context.Context, context.CancelFunc) {
-
-	var ctx context.Context
-
+func chromectx(t *testing.T) context.Context {
 	// looks for locally installed Chrome
-	ctx, _ = chromedp.NewContext(context.Background())
+	ctx, ccancel := chromedp.NewContext(context.Background(), chromedp.WithErrorf(t.Errorf), chromedp.WithDebugf(t.Logf), chromedp.WithLogf(t.Logf))
+	t.Cleanup(ccancel)
+
+	// Wait for browser to be ready.
+	err := chromedp.Run(ctx)
+	if err != nil {
+		t.Fatalf("failed to start browser: %s", err.Error())
+	}
 
-	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+	ctx, tcancel := context.WithTimeout(ctx, 30*time.Second)
+	t.Cleanup(tcancel)
 
-	return ctx, cancel
+	return ctx
 }
 
 func startServer(t *testing.T) (string, *httptest.Server) {