diff --git a/test/chromium/launcher.spec.js b/test/chromium/launcher.spec.js
index 62afe3fad4..134b456dc4 100644
--- a/test/chromium/launcher.spec.js
+++ b/test/chromium/launcher.spec.js
@@ -72,6 +72,7 @@ describe('extensions', () => {
     expect(backgroundPage).toBeTruthy();
     expect(context.backgroundPages()).toContain(backgroundPage);
     expect(context.pages()).not.toContain(backgroundPage);
+    await context.close();
     await removeUserDataDir(userDataDir);
   });
 });
diff --git a/test/launcher.spec.js b/test/launcher.spec.js
index 33cc7c6ce3..b8623c5990 100644
--- a/test/launcher.spec.js
+++ b/test/launcher.spec.js
@@ -251,8 +251,12 @@ describe('browserType.launch |webSocket| option', function() {
     const browserServer = await browserType.launchServer(defaultBrowserOptions);
     const browser = await browserType.connect({ wsEndpoint: browserServer.wsEndpoint() });
     const disconnectedEventPromise = new Promise(resolve => browser.once('disconnected', resolve));
+    const closedPromise = new Promise(f => browserServer.on('close', f));
     browserServer.kill();
-    await disconnectedEventPromise;
+    await Promise.all([
+      disconnectedEventPromise,
+      closedPromise,
+    ]);
   });
 });
 
diff --git a/test/test.js b/test/test.js
index df48f7078d..01f275329c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -105,15 +105,12 @@ function collect(browserNames) {
     const browserEnvironment = new Environment(browserName);
     browserEnvironment.beforeAll(async state => {
       state.browser = await state.browserType.launch(launchOptions);
-      // TODO: remove browserServer from state.
-      state.browserServer = state.browser._ownedServer;
-      state._stdout = readline.createInterface({ input: state.browserServer.process().stdout });
-      state._stderr = readline.createInterface({ input: state.browserServer.process().stderr });
+      state._stdout = readline.createInterface({ input: state.browser._ownedServer.process().stdout });
+      state._stderr = readline.createInterface({ input: state.browser._ownedServer.process().stderr });
     });
     browserEnvironment.afterAll(async state => {
-      await state.browserServer.close();
+      await state.browser.close();
       delete state.browser;
-      delete state.browserServer;
       state._stdout.close();
       state._stderr.close();
       delete state._stdout;