diff --git a/packages/headless/test/helpers/with-web.js b/packages/headless/test/helpers/with-web.js
index 606adad..d236cb8 100644
--- a/packages/headless/test/helpers/with-web.js
+++ b/packages/headless/test/helpers/with-web.js
@@ -16,14 +16,32 @@ export function withWeb(task, options) {
     const {payload: config} = await socket.send({type: 'config.get', payload: '@flecks/web'});
     this.timeout(previousTimeout + (Date.now() - start));
     const {browser, page} = await createBrowser(optionsWithTask);
+    if (options.beforePage) {
+      await options.beforePage({
+        browser,
+        page,
+        server,
+        socket,
+      });
+    }
     const response = await connectPage(page, `http://${config.public}`, optionsWithTask);
-    return task({
-      browser,
-      page,
-      response,
-      server,
-      socket,
-      task: this,
-    });
+    let taskError;
+    try {
+      await task({
+        browser,
+        page,
+        response,
+        server,
+        socket,
+        task: this,
+      });
+    }
+    catch (error) {
+      taskError = error;
+    }
+    await browser.close();
+    if (taskError) {
+      throw taskError;
+    }
   };
 }
diff --git a/packages/web/test/up.js b/packages/web/test/up.js
index 57510c4..8f74011 100644
--- a/packages/web/test/up.js
+++ b/packages/web/test/up.js
@@ -12,7 +12,6 @@ const options = {
 
 it('brings a client up', withWeb(
   async ({
-    browser,
     page,
     response,
   }) => {
@@ -37,7 +36,6 @@ it('brings a client up', withWeb(
       .to.deep.equal({why: 'hello there'});
     expect(request)
       .to.equal('testing-value-value');
-    await browser.close();
   },
   options,
 ));