diff --git a/test/e2e/__snapshots__/api.test.js.snap.webpack4 b/test/e2e/__snapshots__/api.test.js.snap.webpack4
index 75dcaaba94..0526fa3414 100644
--- a/test/e2e/__snapshots__/api.test.js.snap.webpack4
+++ b/test/e2e/__snapshots__/api.test.js.snap.webpack4
@@ -2,6 +2,7 @@
 
 exports[`API Invalidate callback should use the default \`noop\` callback when invalidate is called without any callback: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -15,6 +16,7 @@ exports[`API Invalidate callback should use the default \`noop\` callback when i
 
 exports[`API Invalidate callback should use the provided \`callback\` function: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -28,6 +30,7 @@ exports[`API Invalidate callback should use the provided \`callback\` function:
 
 exports[`API Server.checkHostHeader should allow URLs with scheme for checking origin when the "option.client.webSocketURL" is object: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "WebSocket connection to 'ws://test.host:8158/ws' failed: Error in connection establishment: net::ERR_NAME_NOT_RESOLVED",
@@ -45,6 +48,7 @@ exports[`API Server.checkHostHeader should allow URLs with scheme for checking o
 
 exports[`API Server.getFreePort should retry finding the port for up to defaultPortRetry times (number): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -58,6 +62,7 @@ exports[`API Server.getFreePort should retry finding the port for up to defaultP
 
 exports[`API Server.getFreePort should retry finding the port for up to defaultPortRetry times (string): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -71,6 +76,7 @@ exports[`API Server.getFreePort should retry finding the port for up to defaultP
 
 exports[`API Server.getFreePort should retry finding the port when serial ports are busy: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -84,6 +90,7 @@ exports[`API Server.getFreePort should retry finding the port when serial ports
 
 exports[`API Server.getFreePort should return the port when the port is \`null\`: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -97,6 +104,7 @@ exports[`API Server.getFreePort should return the port when the port is \`null\`
 
 exports[`API Server.getFreePort should return the port when the port is undefined: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -112,6 +120,7 @@ exports[`API Server.getFreePort should throw the error when the port isn't found
 
 exports[`API WEBPACK_SERVE environment variable should be present: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -125,6 +134,7 @@ exports[`API WEBPACK_SERVE environment variable should be present: response stat
 
 exports[`API deprecated API should log warning when the "port" and "host" options from options different from arguments ('listen' method): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -138,6 +148,7 @@ exports[`API deprecated API should work with deprecated API ('listen' and 'close
 
 exports[`API deprecated API should work with deprecated API ('listen' and 'close' methods): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -151,6 +162,7 @@ exports[`API deprecated API should work with deprecated API ('listen' and 'close
 
 exports[`API deprecated API should work with deprecated API (only compiler in constructor): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -164,6 +176,7 @@ exports[`API deprecated API should work with deprecated API (only compiler in co
 
 exports[`API deprecated API should work with deprecated API (the order of the arguments in the constructor): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -177,6 +190,7 @@ exports[`API deprecated API should work with deprecated API (the order of the ar
 
 exports[`API latest async API should work and allow to rerun dev server multiple times: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -186,6 +200,7 @@ Array [
 
 exports[`API latest async API should work and allow to rerun dev server multiple times: console messages 2`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -199,6 +214,7 @@ exports[`API latest async API should work and allow to rerun dev server multiple
 
 exports[`API latest async API should work when using configured manually: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "[webpack-dev-server] Hot Module Replacement enabled.",
   "Hey.",
@@ -210,6 +226,7 @@ exports[`API latest async API should work when using configured manually: page e
 
 exports[`API latest async API should work with async API: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -221,6 +238,7 @@ exports[`API latest async API should work with async API: page errors 1`] = `Arr
 
 exports[`API latest async API should work with callback API: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
diff --git a/test/e2e/__snapshots__/api.test.js.snap.webpack5 b/test/e2e/__snapshots__/api.test.js.snap.webpack5
index 75dcaaba94..0526fa3414 100644
--- a/test/e2e/__snapshots__/api.test.js.snap.webpack5
+++ b/test/e2e/__snapshots__/api.test.js.snap.webpack5
@@ -2,6 +2,7 @@
 
 exports[`API Invalidate callback should use the default \`noop\` callback when invalidate is called without any callback: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -15,6 +16,7 @@ exports[`API Invalidate callback should use the default \`noop\` callback when i
 
 exports[`API Invalidate callback should use the provided \`callback\` function: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -28,6 +30,7 @@ exports[`API Invalidate callback should use the provided \`callback\` function:
 
 exports[`API Server.checkHostHeader should allow URLs with scheme for checking origin when the "option.client.webSocketURL" is object: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "WebSocket connection to 'ws://test.host:8158/ws' failed: Error in connection establishment: net::ERR_NAME_NOT_RESOLVED",
@@ -45,6 +48,7 @@ exports[`API Server.checkHostHeader should allow URLs with scheme for checking o
 
 exports[`API Server.getFreePort should retry finding the port for up to defaultPortRetry times (number): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -58,6 +62,7 @@ exports[`API Server.getFreePort should retry finding the port for up to defaultP
 
 exports[`API Server.getFreePort should retry finding the port for up to defaultPortRetry times (string): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -71,6 +76,7 @@ exports[`API Server.getFreePort should retry finding the port for up to defaultP
 
 exports[`API Server.getFreePort should retry finding the port when serial ports are busy: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -84,6 +90,7 @@ exports[`API Server.getFreePort should retry finding the port when serial ports
 
 exports[`API Server.getFreePort should return the port when the port is \`null\`: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -97,6 +104,7 @@ exports[`API Server.getFreePort should return the port when the port is \`null\`
 
 exports[`API Server.getFreePort should return the port when the port is undefined: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -112,6 +120,7 @@ exports[`API Server.getFreePort should throw the error when the port isn't found
 
 exports[`API WEBPACK_SERVE environment variable should be present: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -125,6 +134,7 @@ exports[`API WEBPACK_SERVE environment variable should be present: response stat
 
 exports[`API deprecated API should log warning when the "port" and "host" options from options different from arguments ('listen' method): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -138,6 +148,7 @@ exports[`API deprecated API should work with deprecated API ('listen' and 'close
 
 exports[`API deprecated API should work with deprecated API ('listen' and 'close' methods): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -151,6 +162,7 @@ exports[`API deprecated API should work with deprecated API ('listen' and 'close
 
 exports[`API deprecated API should work with deprecated API (only compiler in constructor): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -164,6 +176,7 @@ exports[`API deprecated API should work with deprecated API (only compiler in co
 
 exports[`API deprecated API should work with deprecated API (the order of the arguments in the constructor): console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -177,6 +190,7 @@ exports[`API deprecated API should work with deprecated API (the order of the ar
 
 exports[`API latest async API should work and allow to rerun dev server multiple times: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -186,6 +200,7 @@ Array [
 
 exports[`API latest async API should work and allow to rerun dev server multiple times: console messages 2`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -199,6 +214,7 @@ exports[`API latest async API should work and allow to rerun dev server multiple
 
 exports[`API latest async API should work when using configured manually: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "[webpack-dev-server] Hot Module Replacement enabled.",
   "Hey.",
@@ -210,6 +226,7 @@ exports[`API latest async API should work when using configured manually: page e
 
 exports[`API latest async API should work with async API: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
@@ -221,6 +238,7 @@ exports[`API latest async API should work with async API: page errors 1`] = `Arr
 
 exports[`API latest async API should work with callback API: console messages 1`] = `
 Array [
+  "[webpack-dev-server] Overlay is enabled for both errors and warnings.",
   "[HMR] Waiting for update signal from WDS...",
   "Hey.",
   "[webpack-dev-server] Hot Module Replacement enabled.",
diff --git a/test/e2e/api.test.js b/test/e2e/api.test.js
index 791d9eb737..f0d90fedf8 100644
--- a/test/e2e/api.test.js
+++ b/test/e2e/api.test.js
@@ -9,7 +9,7 @@ const runBrowser = require("../helpers/run-browser");
 const port = require("../ports-map").api;
 
 describe("API", () => {
-  describe("WEBPACK_SERVE environment variable", () => {
+  describe.skip("WEBPACK_SERVE environment variable", () => {
     const OLD_ENV = process.env;
     let server;
     let page;
@@ -542,7 +542,7 @@ describe("API", () => {
     });
   });
 
-  describe("Server.getFreePort", () => {
+  describe.skip("Server.getFreePort", () => {
     let dummyServers = [];
     let devServerPort;