diff --git a/mocha-config/puppeteer-unit-tests.js b/mocha-config/puppeteer-unit-tests.js
index 01dcd44e25fea..23fb4f8cfa329 100644
--- a/mocha-config/puppeteer-unit-tests.js
+++ b/mocha-config/puppeteer-unit-tests.js
@@ -18,9 +18,10 @@ const base = require('./base');
 
 module.exports = {
   ...base,
-  file: ['./test/mocha-utils.js'],
+  require: ['./test/mocha-utils.js'],
   spec: 'test/*.spec.js',
+  parallel: process.env.CI && !process.env.COVERAGE,
   // retry twice more, so we run each test up to 3 times if needed.
-  retries: 2,
+  retries: process.env.CI ? 2 : 0,
   timeout: 25 * 1000,
 };
diff --git a/package.json b/package.json
index 0384659ee18f2..abfac2c84272f 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "expect": "^25.2.7",
     "jpeg-js": "^0.3.7",
     "minimist": "^1.2.0",
-    "mocha": "^7.1.1",
+    "mocha": "^8.0.1",
     "ncp": "^2.0.0",
     "pixelmatch": "^4.0.2",
     "pngjs": "^5.0.0",
diff --git a/test/coverage-utils.js b/test/coverage-utils.js
index cff80d7e1d3a5..cd490e9f5bc75 100644
--- a/test/coverage-utils.js
+++ b/test/coverage-utils.js
@@ -102,16 +102,17 @@ const trackCoverage = () => {
   clearOldCoverage();
   const coverageMap = new Map();
 
-  before(() => {
-    const api = require('../lib/api');
-    const events = require('../lib/common/Events');
-    for (const [className, classType] of Object.entries(api))
-      traceAPICoverage(coverageMap, events, className, classType);
-  });
-
-  after(() => {
-    writeCoverage(coverageMap);
-  });
+  return {
+    beforeAll: () => {
+      const api = require('../lib/api');
+      const events = require('../lib/common/Events');
+      for (const [className, classType] of Object.entries(api))
+        traceAPICoverage(coverageMap, events, className, classType);
+    },
+    afterAll: () => {
+      writeCoverage(coverageMap);
+    },
+  };
 };
 
 module.exports = {
diff --git a/test/mocha-utils.js b/test/mocha-utils.js
index 469545e2207a7..d72b180304439 100644
--- a/test/mocha-utils.js
+++ b/test/mocha-utils.js
@@ -140,7 +140,14 @@ global.describeChromeOnly = (...args) => {
   if (isChrome) return describe(...args);
 };
 
-if (process.env.COVERAGE) trackCoverage();
+let coverageHooks = {
+  beforeAll: () => {},
+  afterAll: () => {},
+};
+
+if (process.env.COVERAGE) {
+  coverageHooks = trackCoverage();
+}
 
 console.log(
   `Running unit tests with:
@@ -176,31 +183,39 @@ exports.setupTestPageAndContextHooks = () => {
   });
 };
 
-before(async () => {
-  const { server, httpsServer } = await setupServer();
-
-  state.puppeteer = puppeteer;
-  state.defaultBrowserOptions = defaultBrowserOptions;
-  state.server = server;
-  state.httpsServer = httpsServer;
-  state.isFirefox = isFirefox;
-  state.isChrome = isChrome;
-  state.isHeadless = isHeadless;
-  state.puppeteerPath = path.resolve(path.join(__dirname, '..'));
-});
-
-beforeEach(async () => {
-  state.server.reset();
-  state.httpsServer.reset();
-});
-
-after(async () => {
-  await state.server.stop();
-  state.server = null;
-  await state.httpsServer.stop();
-  state.httpsServer = null;
-});
-
-afterEach(() => {
-  sinon.restore();
-});
+exports.mochaHooks = {
+  beforeAll: [
+    async () => {
+      const { server, httpsServer } = await setupServer();
+
+      state.puppeteer = puppeteer;
+      state.defaultBrowserOptions = defaultBrowserOptions;
+      state.server = server;
+      state.httpsServer = httpsServer;
+      state.isFirefox = isFirefox;
+      state.isChrome = isChrome;
+      state.isHeadless = isHeadless;
+      state.puppeteerPath = path.resolve(path.join(__dirname, '..'));
+    },
+    coverageHooks.beforeAll,
+  ],
+
+  beforeEach: async () => {
+    state.server.reset();
+    state.httpsServer.reset();
+  },
+
+  afterAll: [
+    async () => {
+      await state.server.stop();
+      state.server = null;
+      await state.httpsServer.stop();
+      state.httpsServer = null;
+    },
+    coverageHooks.afterAll,
+  ],
+
+  afterEach: () => {
+    sinon.restore();
+  },
+};