diff --git a/client-src/default/webpack.config.js b/client-src/default/webpack.config.js
index 20f0d1d76b..f63160971f 100644
--- a/client-src/default/webpack.config.js
+++ b/client-src/default/webpack.config.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const webpack = require('webpack');
 
 module.exports = {
   mode: 'production',
@@ -9,7 +10,8 @@ module.exports = {
     path: path.resolve(__dirname, '../../client/default'),
     filename: 'index.bundle.js',
   },
-  target: ['web', 'es5'],
+  // Workaround for webpack@4 installation
+  target: webpack.webpack ? ['web', 'es5'] : 'web',
   module: {
     rules: [
       {
diff --git a/client-src/sockjs/webpack.config.js b/client-src/sockjs/webpack.config.js
index e4c3bd347a..07cd5a18df 100644
--- a/client-src/sockjs/webpack.config.js
+++ b/client-src/sockjs/webpack.config.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const webpack = require('webpack');
 
 module.exports = {
   mode: 'production',
@@ -11,5 +12,6 @@ module.exports = {
     library: 'SockJS',
     libraryTarget: 'umd',
   },
-  target: ['web', 'es5'],
+  // Workaround for webpack@4 installation
+  target: webpack.webpack ? ['web', 'es5'] : 'web',
 };
diff --git a/client-src/transpiled-modules/webpack.config.js b/client-src/transpiled-modules/webpack.config.js
index a445f08116..2fd5625d16 100644
--- a/client-src/transpiled-modules/webpack.config.js
+++ b/client-src/transpiled-modules/webpack.config.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const webpack = require('webpack');
 const { merge } = require('webpack-merge');
 
 const base = {
@@ -9,7 +10,7 @@ const base = {
     path: path.resolve(__dirname, '../../client/transpiled-modules'),
     libraryTarget: 'commonjs2',
   },
-  target: ['web', 'es5'],
+  target: webpack.webpack ? ['web', 'es5'] : 'web',
   module: {
     rules: [
       {
diff --git a/test/cli/__snapshots__/cli.test.js.snap b/test/cli/__snapshots__/cli.test.js.snap
index 2e31ea80d0..375741bfc0 100644
--- a/test/cli/__snapshots__/cli.test.js.snap
+++ b/test/cli/__snapshots__/cli.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`CLI --hot webpack 4 1`] = `
 "<i> [webpack-dev-server] Project is running at http://localhost:8080/
+<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/static' directory
 <i> [webpack-dev-middleware] Hash: X
 <i> Version: webpack x.x.x Time: Xms
 <i> Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
@@ -29,6 +30,7 @@ exports[`CLI --hot webpack 4 1`] = `
 
 exports[`CLI --hot webpack 5 1`] = `
 "<i> [webpack-dev-server] Project is running at http://localhost:8080/
+<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/static' directory
 <i> [webpack-dev-middleware] asset main.js X KiB [emitted] (name: main)
 <i> runtime modules X KiB 10 modules
 <i> cacheable modules X KiB
@@ -47,6 +49,7 @@ exports[`CLI --hot webpack 5 1`] = `
 
 exports[`CLI --no-hot webpack 4 1`] = `
 "<i> [webpack-dev-server] Project is running at http://localhost:8080/
+<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/static' directory
 <i> [webpack-dev-middleware] Hash: X
 <i> Version: webpack x.x.x Time: Xms
 <i> Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
@@ -74,6 +77,7 @@ exports[`CLI --no-hot webpack 4 1`] = `
 
 exports[`CLI --no-hot webpack 5 1`] = `
 "<i> [webpack-dev-server] Project is running at http://localhost:8080/
+<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/static' directory
 <i> [webpack-dev-middleware] asset main.js X KiB [emitted] (name: main)
 <i> runtime modules X bytes 3 modules
 <i> cacheable modules X KiB
diff --git a/test/cli/cli.test.js b/test/cli/cli.test.js
index 48c5ddbcc0..10ece79d67 100644
--- a/test/cli/cli.test.js
+++ b/test/cli/cli.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { join, resolve } = require('path');
+const path = require('path');
 const execa = require('execa');
 const internalIp = require('internal-ip');
 const testBin = require('../helpers/test-bin');
@@ -9,11 +9,9 @@ const isWebpack5 = require('../helpers/isWebpack5');
 // skip if webpack-dev-server is not linked
 let runCLITest = describe;
 let basePath;
+
 try {
-  basePath = join(require.resolve('webpack-dev-server'), '..', '..').replace(
-    /\\/g,
-    '/'
-  );
+  basePath = path.join(require.resolve('webpack-dev-server'), '..', '..');
 } catch {
   runCLITest = describe.skip;
 }
@@ -39,7 +37,9 @@ runCLITest('CLI', () => {
         '$1 Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT'
       )
       .replace(/webpack [^ )]+/g, 'webpack x.x.x')
+      .replace(new RegExp(quotemeta(basePath.replace(/\\/g, '/')), 'g'), 'Xdir')
       .replace(new RegExp(quotemeta(basePath), 'g'), 'Xdir')
+      .replace(/[\\/]static/, '/static')
       .replace(/(Hash:) [a-z0-9]+/g, '$1 X')
       .replace(/ dependencies:Xms/g, '')
       .replace(/, additional resolving: X ms/g, '');
@@ -178,7 +178,7 @@ runCLITest('CLI', () => {
   it('should log public path', (done) => {
     testBin(
       false,
-      resolve(__dirname, '../fixtures/dev-public-path/webpack.config.js')
+      path.resolve(__dirname, '../fixtures/dev-public-path/webpack.config.js')
     )
       .then((output) => {
         expect(output.exitCode).toEqual(0);
@@ -194,10 +194,35 @@ runCLITest('CLI', () => {
       });
   });
 
+  it('should log static', (done) => {
+    testBin(
+      false,
+      path.resolve(__dirname, '../fixtures/static/webpack.config.js')
+    )
+      .then((output) => {
+        console.log(output);
+        expect(output.exitCode).toEqual(0);
+        done();
+      })
+      .catch((err) => {
+        const staticDirectory = path.resolve(
+          __dirname,
+          '../fixtures/static/static'
+        );
+
+        // for windows
+        expect(err.stderr).toContain(
+          `Content not from webpack is served from '${staticDirectory}' directory`
+        );
+        expect(err.stderr).toContain('Compiled successfully.');
+        done();
+      });
+  });
+
   it('should accept the promise function of webpack.config.js', (done) => {
     testBin(
       false,
-      resolve(__dirname, '../fixtures/promise-config/webpack.config.js')
+      path.resolve(__dirname, '../fixtures/promise-config/webpack.config.js')
     )
       .then((output) => {
         expect(output.exitCode).toEqual(0);
@@ -211,8 +236,8 @@ runCLITest('CLI', () => {
   });
 
   it('should exit the process when SIGINT is detected', (done) => {
-    const cliPath = resolve(__dirname, '../../bin/webpack-dev-server.js');
-    const examplePath = resolve(__dirname, '../../examples/cli/public');
+    const cliPath = path.resolve(__dirname, '../../bin/webpack-dev-server.js');
+    const examplePath = path.resolve(__dirname, '../../examples/cli/public');
     const cp = execa('node', [cliPath], { cwd: examplePath });
 
     cp.stderr.on('data', (data) => {
@@ -231,8 +256,8 @@ runCLITest('CLI', () => {
   });
 
   it('should exit the process when SIGINT is detected, even before the compilation is done', (done) => {
-    const cliPath = resolve(__dirname, '../../bin/webpack-dev-server.js');
-    const cwd = resolve(__dirname, '../fixtures/cli');
+    const cliPath = path.resolve(__dirname, '../../bin/webpack-dev-server.js');
+    const cwd = path.resolve(__dirname, '../fixtures/cli');
     const cp = execa('node', [cliPath], { cwd });
 
     let killed = false;
@@ -253,8 +278,8 @@ runCLITest('CLI', () => {
   });
 
   it('should exit the process when stdin ends if --stdin', (done) => {
-    const cliPath = resolve(__dirname, '../../bin/webpack-dev-server.js');
-    const examplePath = resolve(__dirname, '../../examples/cli/public');
+    const cliPath = path.resolve(__dirname, '../../bin/webpack-dev-server.js');
+    const examplePath = path.resolve(__dirname, '../../examples/cli/public');
     const cp = execa('node', [cliPath, '--stdin'], { cwd: examplePath });
 
     cp.stderr.on('data', (data) => {
@@ -274,8 +299,8 @@ runCLITest('CLI', () => {
   });
 
   it('should exit the process when stdin ends if --stdin, even before the compilation is done', (done) => {
-    const cliPath = resolve(__dirname, '../../bin/webpack-dev-server.js');
-    const cwd = resolve(__dirname, '../fixtures/cli');
+    const cliPath = path.resolve(__dirname, '../../bin/webpack-dev-server.js');
+    const cwd = path.resolve(__dirname, '../fixtures/cli');
     const cp = execa('node', [cliPath, '--stdin'], { cwd });
 
     let killed = false;
@@ -299,8 +324,8 @@ runCLITest('CLI', () => {
   // TODO: do not skip after @webpack-cli/serve passes null port by default
   // https://github.com/webpack/webpack-cli/pull/2126
   it.skip('should use different random port when multiple instances are started on different processes', (done) => {
-    const cliPath = resolve(__dirname, '../../bin/webpack-dev-server.js');
-    const cwd = resolve(__dirname, '../fixtures/cli');
+    const cliPath = path.resolve(__dirname, '../../bin/webpack-dev-server.js');
+    const cwd = path.resolve(__dirname, '../fixtures/cli');
 
     const cp = execa('node', [cliPath, '--colors=false'], { cwd });
     const cp2 = execa('node', [cliPath, '--colors=false'], { cwd });
diff --git a/test/fixtures/static/foo.js b/test/fixtures/static/foo.js
new file mode 100644
index 0000000000..f88d8b5040
--- /dev/null
+++ b/test/fixtures/static/foo.js
@@ -0,0 +1,3 @@
+'use strict';
+
+console.log('i am foo!');
diff --git a/test/fixtures/static/static/index.html b/test/fixtures/static/static/index.html
new file mode 100644
index 0000000000..3a990c0653
--- /dev/null
+++ b/test/fixtures/static/static/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+    />
+    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+    <title>Document</title>
+  </head>
+  <body>
+    Test
+  </body>
+</html>
diff --git a/test/fixtures/static/webpack.config.js b/test/fixtures/static/webpack.config.js
new file mode 100644
index 0000000000..2ddf10925d
--- /dev/null
+++ b/test/fixtures/static/webpack.config.js
@@ -0,0 +1,11 @@
+'use strict';
+
+const path = require('path');
+
+module.exports = {
+  mode: 'development',
+  entry: path.resolve(__dirname, 'foo.js'),
+  devServer: {
+    static: path.resolve(__dirname, 'static'),
+  },
+};
diff --git a/test/helpers/test-bin.js b/test/helpers/test-bin.js
index a57da3dd3a..25e3af020a 100644
--- a/test/helpers/test-bin.js
+++ b/test/helpers/test-bin.js
@@ -26,12 +26,7 @@ function testBin(testArgs, configPath) {
     testArgs = testArgs.split(' ');
   }
 
-  const args = [
-    webpackDevServerPath,
-    '--config',
-    configPath,
-    '--no-static',
-  ].concat(testArgs);
+  const args = [webpackDevServerPath, '--config', configPath].concat(testArgs);
 
   return execa('node', args, { cwd, env, timeout: 10000 });
 }