diff --git a/client-src/index.js b/client-src/index.js
index 53bb7a6e30..0116250807 100644
--- a/client-src/index.js
+++ b/client-src/index.js
@@ -12,43 +12,20 @@ const sendMessage = require('./utils/sendMessage');
 const reloadApp = require('./utils/reloadApp');
 const createSocketURL = require('./utils/createSocketURL');
 
-const status = {
-  isUnloading: false,
-  currentHash: '',
-};
-const defaultOptions = {
+const status = { isUnloading: false, currentHash: '' };
+const options = {
   hot: false,
-  hotReload: true,
   liveReload: false,
   initial: true,
   progress: false,
   overlay: false,
 };
 const parsedResourceQuery = parseURL(__resourceQuery);
-const options = defaultOptions;
-
-// Handle Node.js legacy format and `new URL()`
-if (parsedResourceQuery.query) {
-  Object.assign(options, parsedResourceQuery.query);
-} else if (parsedResourceQuery.searchParams) {
-  const paramsToObject = (entries) => {
-    const result = {};
-
-    for (const [key, value] of entries) {
-      result[key] = value;
-    }
 
-    return result;
-  };
-
-  Object.assign(
-    options,
-    paramsToObject(parsedResourceQuery.searchParams.entries())
-  );
+if (parsedResourceQuery.logging) {
+  options.logging = parsedResourceQuery.logging;
 }
 
-const socketURL = createSocketURL(parsedResourceQuery);
-
 function setAllLogLevel(level) {
   // This is needed because the HMR logger operate separately from dev server logger
   webpackHotLog.setLogLevel(
@@ -65,12 +42,6 @@ self.addEventListener('beforeunload', () => {
   status.isUnloading = true;
 });
 
-if (typeof window !== 'undefined') {
-  const qs = window.location.search.toLowerCase();
-
-  options.hotReload = qs.indexOf('hotreload=false') === -1;
-}
-
 const onSocketMessage = {
   hot() {
     options.hot = true;
@@ -220,4 +191,6 @@ const onSocketMessage = {
   },
 };
 
+const socketURL = createSocketURL(parsedResourceQuery);
+
 socket(socketURL, onSocketMessage);
diff --git a/client-src/utils/createSocketURL.js b/client-src/utils/createSocketURL.js
index 525aecd4cb..d0ebbf25f9 100644
--- a/client-src/utils/createSocketURL.js
+++ b/client-src/utils/createSocketURL.js
@@ -5,14 +5,13 @@ const url = require('url');
 // We handle legacy API that is Node.js specific, and a newer API that implements the same WHATWG URL Standard used by web browsers
 // Please look at https://nodejs.org/api/url.html#url_url_strings_and_url_objects
 function createSocketURL(parsedURL) {
-  let { auth, hostname, protocol, port } = parsedURL;
+  let { hostname } = parsedURL;
 
   // Node.js module parses it as `::`
   // `new URL(urlString, [baseURLstring])` parses it as '[::]'
   const isInAddrAny =
     hostname === '0.0.0.0' || hostname === '::' || hostname === '[::]';
 
-  // check ipv4 and ipv6 `all hostname`
   // why do we need this check?
   // hostname n/a for file protocol (example, when using electron, ionic)
   // see: https://github.com/webpack/webpack-dev-server/pull/384
@@ -24,54 +23,55 @@ function createSocketURL(parsedURL) {
     hostname = self.location.hostname;
   }
 
-  if (protocol === 'auto:') {
-    protocol = self.location.protocol;
-  }
+  let socketURLProtocol = parsedURL.protocol || 'ws:';
 
-  // `hostname` can be empty when the script path is relative. In that case, specifying a protocol would result in an invalid URL.
   // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
-  if (hostname && isInAddrAny && self.location.protocol === 'https:') {
-    protocol = self.location.protocol;
+  if (
+    socketURLProtocol === 'auto:' ||
+    (hostname && isInAddrAny && self.location.protocol === 'https:')
+  ) {
+    socketURLProtocol = self.location.protocol;
   }
 
-  const socketURLProtocol = protocol.replace(
+  socketURLProtocol = socketURLProtocol.replace(
     /^(?:http|.+-extension|file)/i,
     'ws'
   );
 
+  let socketURLAuth = '';
+
   // `new URL(urlString, [baseURLstring])` doesn't have `auth` property
   // Parse authentication credentials in case we need them
   if (parsedURL.username) {
-    auth = parsedURL.username;
+    socketURLAuth = parsedURL.username;
 
     // Since HTTP basic authentication does not allow empty username,
     // we only include password if the username is not empty.
     if (parsedURL.password) {
       // Result: <username>:<password>
-      auth = auth.concat(':', parsedURL.password);
+      socketURLAuth = socketURLAuth.concat(':', parsedURL.password);
     }
   }
 
-  const socketURLAuth = auth;
-
   // In case the host is a raw IPv6 address, it can be enclosed in
   // the brackets as the brackets are needed in the final URL string.
   // Need to remove those as url.format blindly adds its own set of brackets
   // if the host string contains colons. That would lead to non-working
   // double brackets (e.g. [[::]]) host
   //
-  // All of these sock url params are optionally passed in through resourceQuery,
+  // All of these web socket url params are optionally passed in through resourceQuery,
   // so we need to fall back to the default if they are not provided
-  const socketURLHostname = (hostname || 'localhost').replace(
-    /^\[(.*)\]$/,
-    '$1'
-  );
+  const socketURLHostname = (
+    hostname ||
+    self.location.hostname ||
+    'localhost'
+  ).replace(/^\[(.*)\]$/, '$1');
 
-  if (!port || port === '0') {
-    port = self.location.port;
-  }
+  let socketURLPort = parsedURL.port;
 
-  const socketURLPort = port;
+  if (!socketURLPort || socketURLPort === '0') {
+    socketURLPort = self.location.port;
+  }
 
   // If path is provided it'll be passed in via the resourceQuery as a
   // query param so it has to be parsed out of the querystring in order for the
diff --git a/client-src/utils/parseURL.js b/client-src/utils/parseURL.js
index d40db3c2b1..effcc0f78b 100644
--- a/client-src/utils/parseURL.js
+++ b/client-src/utils/parseURL.js
@@ -4,24 +4,16 @@ const url = require('url');
 const getCurrentScriptSource = require('./getCurrentScriptSource');
 
 function parseURL(resourceQuery) {
-  let options;
+  let options = {};
 
   if (typeof resourceQuery === 'string' && resourceQuery !== '') {
-    // If this bundle is inlined, use the resource query to get the correct url.
-    // for backward compatibility we supports:
-    // - ?ws://0.0.0.0:8096&3Flogging=info
-    // - ?ws%3A%2F%2F192.168.0.5%3A8080%2F%3Flogging%3Dinfo
-    // Also we support `http` and `https` for backward compatibility too
-    options = url.parse(
-      decodeURIComponent(
-        resourceQuery
-          // strip leading `?` from query string to get a valid URL
-          .substr(1)
-          // replace first `&` with `?` to have a valid query string
-          .replace('&', '?')
-      ),
-      true
-    );
+    const searchParams = resourceQuery.substr(1).split('&');
+
+    for (let i = 0; i < searchParams.length; i++) {
+      const pair = searchParams[i].split('=');
+
+      options[pair[0]] = decodeURIComponent(pair[1]);
+    }
   } else {
     // Else, get the url from the <script> this file was called with.
     const scriptSource = getCurrentScriptSource();
diff --git a/client-src/utils/reloadApp.js b/client-src/utils/reloadApp.js
index 36206eda53..a7174de39b 100644
--- a/client-src/utils/reloadApp.js
+++ b/client-src/utils/reloadApp.js
@@ -2,11 +2,8 @@
 
 const { log } = require('./log');
 
-function reloadApp(
-  { hotReload, hot, liveReload },
-  { isUnloading, currentHash }
-) {
-  if (isUnloading || !hotReload) {
+function reloadApp({ hot, liveReload }, { isUnloading, currentHash }) {
+  if (isUnloading) {
     return;
   }
 
diff --git a/lib/utils/DevServerPlugin.js b/lib/utils/DevServerPlugin.js
index 4107a3ea63..12a04fadab 100644
--- a/lib/utils/DevServerPlugin.js
+++ b/lib/utils/DevServerPlugin.js
@@ -1,8 +1,5 @@
 'use strict';
 
-const ipaddr = require('ipaddr.js');
-const getSocketClientPath = require('./getSocketClientPath');
-
 /**
  * An Entry, it can be of type string or string[] or Object<string | string[],string>
  * @typedef {(string[] | string | Object<string | string[],string>)} Entry
@@ -16,11 +13,66 @@ class DevServerPlugin {
     this.options = options;
   }
 
+  getWebsocketTransport() {
+    let ClientImplementation;
+    let clientImplementationFound = true;
+
+    const isKnownWebSocketServerImplementation =
+      typeof this.options.webSocketServer.type === 'string' &&
+      (this.options.webSocketServer.type === 'ws' ||
+        this.options.webSocketServer.type === 'sockjs');
+
+    let clientTransport;
+
+    if (typeof this.options.client.transport !== 'undefined') {
+      clientTransport = this.options.client.transport;
+    } else if (isKnownWebSocketServerImplementation) {
+      clientTransport = this.options.webSocketServer.type;
+    }
+
+    switch (typeof clientTransport) {
+      case 'string':
+        // could be 'sockjs', 'ws', or a path that should be required
+        if (clientTransport === 'sockjs') {
+          ClientImplementation = require.resolve(
+            '../../client/clients/SockJSClient'
+          );
+        } else if (clientTransport === 'ws') {
+          ClientImplementation = require.resolve(
+            '../../client/clients/WebsocketClient'
+          );
+        } else {
+          try {
+            // eslint-disable-next-line import/no-dynamic-require
+            ClientImplementation = require.resolve(clientTransport);
+          } catch (e) {
+            clientImplementationFound = false;
+          }
+        }
+        break;
+      default:
+        clientImplementationFound = false;
+    }
+
+    if (!clientImplementationFound) {
+      throw new Error(
+        `${
+          !isKnownWebSocketServerImplementation
+            ? 'When you use custom web socket implementation you must explicitly specify client.transport. '
+            : ''
+        }client.transport must be a string denoting a default implementation (e.g. 'sockjs', 'ws') or a full path to a JS file via require.resolve(...) which exports a class `
+      );
+    }
+
+    return ClientImplementation;
+  }
+
   /**
    * @returns {string}
    */
   getWebSocketURL() {
     const { options } = this;
+    const searchParams = new URLSearchParams();
 
     /** @type {"ws:" | "wss:" | "http:" | "https:" | "auto:"} */
     let protocol;
@@ -32,6 +84,16 @@ class DevServerPlugin {
       protocol = options.https ? 'wss:' : 'ws:';
     }
 
+    searchParams.set('protocol', protocol);
+
+    if (typeof options.client.webSocketURL.username !== 'undefined') {
+      searchParams.set('username', options.client.webSocketURL.username);
+    }
+
+    if (typeof options.client.webSocketURL.password !== 'undefined') {
+      searchParams.set('password', options.client.webSocketURL.password);
+    }
+
     /** @type {string} */
     let hostname;
 
@@ -59,6 +121,8 @@ class DevServerPlugin {
       hostname = '0.0.0.0';
     }
 
+    searchParams.set('hostname', hostname);
+
     /** @type {number | string} */
     let port;
 
@@ -83,9 +147,11 @@ class DevServerPlugin {
     }
     // The `port` option is not specified or set to `auto`
     else {
-      port = 0;
+      port = '0';
     }
 
+    searchParams.set('port', String(port));
+
     /** @type {string} */
     let pathname = '';
 
@@ -93,7 +159,6 @@ class DevServerPlugin {
     if (typeof options.client.webSocketURL.pathname !== 'undefined') {
       pathname = options.client.webSocketURL.pathname;
     }
-
     // Web socket server works on custom `path`
     else if (
       typeof options.webSocketServer.options.prefix !== 'undefined' ||
@@ -104,42 +169,13 @@ class DevServerPlugin {
         options.webSocketServer.options.path;
     }
 
-    /** @type {string} */
-    let username = '';
-
-    if (typeof options.client.webSocketURL.username !== 'undefined') {
-      username = options.client.webSocketURL.username;
-    }
-
-    /** @type {string} */
-    let password = '';
-
-    if (typeof options.client.webSocketURL.password !== 'undefined') {
-      password = options.client.webSocketURL.password;
-    }
-
-    const searchParams = new URLSearchParams();
+    searchParams.set('pathname', pathname);
 
     if (typeof options.client.logging !== 'undefined') {
       searchParams.set('logging', options.client.logging);
     }
 
-    const searchParamsString = searchParams.toString();
-
-    return encodeURIComponent(
-      new URL(
-        `${protocol}//${username}${password ? `:${password}` : ''}${
-          username || password ? `@` : ''
-        }${ipaddr.IPv6.isIPv6(hostname) ? `[${hostname}]` : hostname}${
-          port ? `:${port}` : ''
-        }${pathname || '/'}${
-          searchParamsString ? `?${searchParamsString}` : ''
-        }`
-      ).toString()
-    ).replace(
-      /[!'()*]/g,
-      (character) => `%${character.charCodeAt(0).toString(16)}`
-    );
+    return searchParams.toString();
   }
 
   /**
@@ -315,7 +351,7 @@ class DevServerPlugin {
     }
 
     const providePlugin = new webpack.ProvidePlugin({
-      __webpack_dev_server_client__: getSocketClientPath(this.options),
+      __webpack_dev_server_client__: this.getWebsocketTransport(),
     });
 
     providePlugin.apply(compiler);
diff --git a/lib/utils/getSocketClientPath.d.ts b/lib/utils/getSocketClientPath.d.ts
deleted file mode 100644
index e41e415152..0000000000
--- a/lib/utils/getSocketClientPath.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare function getSocketClientPath(options: Object): string;
-
-export = getSocketClientPath;
diff --git a/lib/utils/getSocketClientPath.js b/lib/utils/getSocketClientPath.js
deleted file mode 100644
index 5484ba358e..0000000000
--- a/lib/utils/getSocketClientPath.js
+++ /dev/null
@@ -1,57 +0,0 @@
-'use strict';
-
-function getSocketClientPath(options) {
-  let ClientImplementation;
-  let clientImplementationFound = true;
-
-  const isKnownWebSocketServerImplementation =
-    typeof options.webSocketServer.type === 'string' &&
-    (options.webSocketServer.type === 'ws' ||
-      options.webSocketServer.type === 'sockjs');
-
-  let clientTransport;
-
-  if (typeof options.client.transport !== 'undefined') {
-    clientTransport = options.client.transport;
-  } else if (isKnownWebSocketServerImplementation) {
-    clientTransport = options.webSocketServer.type;
-  }
-
-  switch (typeof clientTransport) {
-    case 'string':
-      // could be 'sockjs', 'ws', or a path that should be required
-      if (clientTransport === 'sockjs') {
-        ClientImplementation = require.resolve(
-          '../../client/clients/SockJSClient'
-        );
-      } else if (clientTransport === 'ws') {
-        ClientImplementation = require.resolve(
-          '../../client/clients/WebsocketClient'
-        );
-      } else {
-        try {
-          // eslint-disable-next-line import/no-dynamic-require
-          ClientImplementation = require.resolve(clientTransport);
-        } catch (e) {
-          clientImplementationFound = false;
-        }
-      }
-      break;
-    default:
-      clientImplementationFound = false;
-  }
-
-  if (!clientImplementationFound) {
-    throw new Error(
-      `${
-        !isKnownWebSocketServerImplementation
-          ? 'When you use custom web socket implementation you must explicitly specify client.transport. '
-          : ''
-      }client.transport must be a string denoting a default implementation (e.g. 'sockjs', 'ws') or a full path to a JS file via require.resolve(...) which exports a class `
-    );
-  }
-
-  return ClientImplementation;
-}
-
-module.exports = getSocketClientPath;
diff --git a/test/client/__snapshots__/index.test.js.snap.webpack4 b/test/client/__snapshots__/index.test.js.snap.webpack4
index 503aad3211..786d04b519 100644
--- a/test/client/__snapshots__/index.test.js.snap.webpack4
+++ b/test/client/__snapshots__/index.test.js.snap.webpack4
@@ -23,7 +23,6 @@ exports[`index should run onSocketMessage.ok 1`] = `"Ok"`;
 exports[`index should run onSocketMessage.ok 2`] = `
 Object {
   "hot": false,
-  "hotReload": true,
   "initial": false,
   "liveReload": false,
   "logging": "info",
diff --git a/test/client/__snapshots__/index.test.js.snap.webpack5 b/test/client/__snapshots__/index.test.js.snap.webpack5
index 503aad3211..786d04b519 100644
--- a/test/client/__snapshots__/index.test.js.snap.webpack5
+++ b/test/client/__snapshots__/index.test.js.snap.webpack5
@@ -23,7 +23,6 @@ exports[`index should run onSocketMessage.ok 1`] = `"Ok"`;
 exports[`index should run onSocketMessage.ok 2`] = `
 Object {
   "hot": false,
-  "hotReload": true,
   "initial": false,
   "liveReload": false,
   "logging": "info",
diff --git a/test/client/index.test.js b/test/client/index.test.js
index 0f576d9d4c..a0445af3ac 100644
--- a/test/client/index.test.js
+++ b/test/client/index.test.js
@@ -50,9 +50,7 @@ describe('index', () => {
     // getUrlOptions
     jest.setMock('../../client-src/utils/parseURL.js', () => {
       return {
-        query: {
-          logging: 'info',
-        },
+        logging: 'info',
       };
     });
 
diff --git a/test/client/utils/__snapshots__/parseURL.test.js.snap.webpack4 b/test/client/utils/__snapshots__/parseURL.test.js.snap.webpack4
deleted file mode 100644
index fff30d1ae3..0000000000
--- a/test/client/utils/__snapshots__/parseURL.test.js.snap.webpack4
+++ /dev/null
@@ -1,246 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`'parseURL' function should return the url when __resourceQuery is '/' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": null,
-  "hostname": null,
-  "href": "/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": null,
-  "query": Object {},
-  "search": null,
-  "slashes": null,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'file://filename' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "filename",
-  "hostname": "filename",
-  "href": "file://filename/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "file:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://0.0.0.0' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "0.0.0.0",
-  "hostname": "0.0.0.0",
-  "href": "http://0.0.0.0/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://127.0.0.1' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "127.0.0.1",
-  "hostname": "127.0.0.1",
-  "href": "http://127.0.0.1/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://user:pass@[::]:8080' 1`] = `
-Url {
-  "auth": "user:pass",
-  "hash": null,
-  "host": "[::]:8080",
-  "hostname": "::",
-  "href": "http://user:pass@[::]:8080/",
-  "path": "/",
-  "pathname": "/",
-  "port": "8080",
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://user:password@localhost/' 1`] = `
-Url {
-  "auth": "user:password",
-  "hash": null,
-  "host": "localhost",
-  "hostname": "localhost",
-  "href": "http://user:password@localhost/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://example.com' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "example.com",
-  "hostname": "example.com",
-  "href": "https://example.com/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://example.com/path' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "example.com",
-  "hostname": "example.com",
-  "href": "https://example.com/path",
-  "path": "/path",
-  "pathname": "/path",
-  "port": null,
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://example.com/path/foo.js' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "example.com",
-  "hostname": "example.com",
-  "href": "https://example.com/path/foo.js",
-  "path": "/path/foo.js",
-  "pathname": "/path/foo.js",
-  "port": null,
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://localhost:123' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "localhost:123",
-  "hostname": "localhost",
-  "href": "https://localhost:123/",
-  "path": "/",
-  "pathname": "/",
-  "port": "123",
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'test' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": null,
-  "hostname": null,
-  "href": "test",
-  "path": "test",
-  "pathname": "test",
-  "port": null,
-  "protocol": null,
-  "query": Object {},
-  "search": null,
-  "slashes": null,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'undefined' 1`] = `
-Url {
-  "auth": null,
-  "fromCurrentScript": true,
-  "hash": null,
-  "host": "localhost",
-  "hostname": "localhost",
-  "href": "http://localhost/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when the current script source is '/' 1`] = `"http://localhost/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'file://filename' 1`] = `"file://filename/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://0.0.0.0' 1`] = `"http://0.0.0.0/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://127.0.0.1' 1`] = `"http://127.0.0.1/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://user:pass@[::]:8080' 1`] = `"http://user:pass@[::]:8080/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://user:password@localhost/' 1`] = `"http://user:password@localhost/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://example.com' 1`] = `"https://example.com/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://example.com/path' 1`] = `"https://example.com/path"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://example.com/path/foo.js' 1`] = `"https://example.com/path/foo.js"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://localhost:123' 1`] = `"https://localhost:123/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'test' 1`] = `"http://localhost/test"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'undefined' 1`] = `
-Url {
-  "auth": null,
-  "fromCurrentScript": true,
-  "hash": null,
-  "host": "localhost",
-  "hostname": "localhost",
-  "href": "http://localhost/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
diff --git a/test/client/utils/__snapshots__/parseURL.test.js.snap.webpack5 b/test/client/utils/__snapshots__/parseURL.test.js.snap.webpack5
deleted file mode 100644
index fff30d1ae3..0000000000
--- a/test/client/utils/__snapshots__/parseURL.test.js.snap.webpack5
+++ /dev/null
@@ -1,246 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`'parseURL' function should return the url when __resourceQuery is '/' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": null,
-  "hostname": null,
-  "href": "/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": null,
-  "query": Object {},
-  "search": null,
-  "slashes": null,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'file://filename' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "filename",
-  "hostname": "filename",
-  "href": "file://filename/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "file:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://0.0.0.0' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "0.0.0.0",
-  "hostname": "0.0.0.0",
-  "href": "http://0.0.0.0/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://127.0.0.1' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "127.0.0.1",
-  "hostname": "127.0.0.1",
-  "href": "http://127.0.0.1/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://user:pass@[::]:8080' 1`] = `
-Url {
-  "auth": "user:pass",
-  "hash": null,
-  "host": "[::]:8080",
-  "hostname": "::",
-  "href": "http://user:pass@[::]:8080/",
-  "path": "/",
-  "pathname": "/",
-  "port": "8080",
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'http://user:password@localhost/' 1`] = `
-Url {
-  "auth": "user:password",
-  "hash": null,
-  "host": "localhost",
-  "hostname": "localhost",
-  "href": "http://user:password@localhost/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://example.com' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "example.com",
-  "hostname": "example.com",
-  "href": "https://example.com/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://example.com/path' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "example.com",
-  "hostname": "example.com",
-  "href": "https://example.com/path",
-  "path": "/path",
-  "pathname": "/path",
-  "port": null,
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://example.com/path/foo.js' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "example.com",
-  "hostname": "example.com",
-  "href": "https://example.com/path/foo.js",
-  "path": "/path/foo.js",
-  "pathname": "/path/foo.js",
-  "port": null,
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'https://localhost:123' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": "localhost:123",
-  "hostname": "localhost",
-  "href": "https://localhost:123/",
-  "path": "/",
-  "pathname": "/",
-  "port": "123",
-  "protocol": "https:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'test' 1`] = `
-Url {
-  "auth": null,
-  "hash": null,
-  "host": null,
-  "hostname": null,
-  "href": "test",
-  "path": "test",
-  "pathname": "test",
-  "port": null,
-  "protocol": null,
-  "query": Object {},
-  "search": null,
-  "slashes": null,
-}
-`;
-
-exports[`'parseURL' function should return the url when __resourceQuery is 'undefined' 1`] = `
-Url {
-  "auth": null,
-  "fromCurrentScript": true,
-  "hash": null,
-  "host": "localhost",
-  "hostname": "localhost",
-  "href": "http://localhost/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
-
-exports[`'parseURL' function should return the url when the current script source is '/' 1`] = `"http://localhost/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'file://filename' 1`] = `"file://filename/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://0.0.0.0' 1`] = `"http://0.0.0.0/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://127.0.0.1' 1`] = `"http://127.0.0.1/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://user:pass@[::]:8080' 1`] = `"http://user:pass@[::]:8080/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'http://user:password@localhost/' 1`] = `"http://user:password@localhost/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://example.com' 1`] = `"https://example.com/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://example.com/path' 1`] = `"https://example.com/path"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://example.com/path/foo.js' 1`] = `"https://example.com/path/foo.js"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'https://localhost:123' 1`] = `"https://localhost:123/"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'test' 1`] = `"http://localhost/test"`;
-
-exports[`'parseURL' function should return the url when the current script source is 'undefined' 1`] = `
-Url {
-  "auth": null,
-  "fromCurrentScript": true,
-  "hash": null,
-  "host": "localhost",
-  "hostname": "localhost",
-  "href": "http://localhost/",
-  "path": "/",
-  "pathname": "/",
-  "port": null,
-  "protocol": "http:",
-  "query": Object {},
-  "search": null,
-  "slashes": true,
-}
-`;
diff --git a/test/client/utils/createSocketURL.test.js b/test/client/utils/createSocketURL.test.js
index 8655992195..035f43e155 100644
--- a/test/client/utils/createSocketURL.test.js
+++ b/test/client/utils/createSocketURL.test.js
@@ -7,90 +7,94 @@
 describe("'createSocketURL' function ", () => {
   const samples = [
     // __resourceQuery, location and socket URL
-    ['?http://example.com/ws', 'http://example.com', 'ws://example.com/ws'],
     [
-      `?${encodeURIComponent('http://example.com/ws')}`,
+      '?hostname=example.com&pathname=/ws',
       'http://example.com',
       'ws://example.com/ws',
     ],
+    ['?protocol=auto:', 'http://example.com', 'ws://example.com/ws'],
+    ['?protocol=auto:', 'https://example.com', 'wss://example.com/ws'],
+    ['?protocol=wss:', 'http://example.com', 'wss://example.com/ws'],
+    ['?protocol=https:', 'https://example.com', 'wss://example.com/ws'],
+    ['?protocol=http:', 'https://example.com', 'ws://example.com/ws'],
+    ['?hostname=example.com', 'http://example.com', 'ws://example.com/ws'],
     [
-      `?${encodeURIComponent('http://example.com/ws?foo=bar')}`,
+      '?username=username&password=password',
       'http://example.com',
-      'ws://example.com/ws',
-    ],
-    ['?http://example.com/ws', 'http://something.com', 'ws://example.com/ws'],
-    [null, 'http://example.com', 'ws://example.com/ws'],
-    ['?https://example.com/ws', 'https://example.com', 'wss://example.com/ws'],
-    [null, 'https://example.com', 'wss://example.com/ws'],
-    [
-      '?http://example.com:0/ws',
-      'http://example.com:8080',
-      'ws://example.com:8080/ws',
-    ],
-    [null, 'http://example.com:8080', 'ws://example.com:8080/ws'],
-    [
-      '?http://example.com/custom-path/',
-      'http://example.com/foo/bar',
-      'ws://example.com/custom-path/',
+      'ws://username:password@example.com/ws',
     ],
-    [null, 'http://example.com/foo/bar', 'ws://example.com/ws'],
     [
-      '?http://user:password@localhost/ws',
-      'http://user:password@localhost/',
-      'ws://user:password@localhost/ws',
+      '?hostname=example.com&port=80',
+      'http://example.com',
+      'ws://example.com:80/ws',
     ],
+    ['?port=0', 'http://example.com:8080', 'ws://example.com:8080/ws'],
+    ['?port=80', 'http://example.com:8080', 'ws://example.com:80/ws'],
+    ['?hostname=0.0.0.0', 'http://127.0.0.1', 'ws://127.0.0.1/ws'],
+    ['?hostname=0.0.0.0', 'http://192.168.0.1', 'ws://192.168.0.1/ws'],
+    ['?hostname=0.0.0.0', 'https://192.168.0.1', 'wss://192.168.0.1/ws'],
+    ['?hostname=0.0.0.0', 'https://example.com', 'wss://example.com/ws'],
     [
-      null,
-      'http://user:password@localhost/',
-      'ws://user:password@localhost/ws',
+      '?hostname=0.0.0.0',
+      'http://example.com:8080',
+      'ws://example.com:8080/ws',
     ],
     [
-      '?http://user:password@localhost:8080/ws',
-      'http://user:password@localhost/',
-      'ws://user:password@localhost:8080/ws',
+      '?hostname=0.0.0.0',
+      'http://example.com:8080',
+      'ws://example.com:8080/ws',
     ],
-    [null, 'http://user@localhost:8080/', 'ws://user@localhost:8080/ws'],
     [
-      null,
-      'http://user:password@localhost:8080/',
-      'ws://user:password@localhost:8080/ws',
+      '?hostname=0.0.0.0',
+      'https://example.com:8080',
+      'wss://example.com:8080/ws',
     ],
-    ['?http://0.0.0.0/ws', 'http://127.0.0.1', 'ws://127.0.0.1/ws'],
-    ['?http://0.0.0.0/ws', 'http://192.168.0.1', 'ws://192.168.0.1/ws'],
-    ['?http://0.0.0.0/ws', 'https://192.168.0.1', 'wss://192.168.0.1/ws'],
-    ['?http://0.0.0.0/ws', 'https://example.com', 'wss://example.com/ws'],
+    ['?hostname=::', 'http://example.com:8080', 'ws://example.com:8080/ws'],
+    ['?hostname=[::]', 'http://example.com:8080', 'ws://example.com:8080/ws'],
+    ['?hostname=[::]', 'http://example.com:8080', 'ws://example.com:8080/ws'],
+
+    ['?hostname=%3A%3A', 'http://example.com:8080', 'ws://example.com:8080/ws'],
+    ['?hostname=%3A%3A1', 'http://example.com:8080', 'ws://[::1]:8080/ws'],
+    ['?hostname=%3A%3A1', 'https://example.com:8080', 'ws://[::1]:8080/ws'],
     [
-      '?http://0.0.0.0/ws',
+      '?hostname=%3A%3A',
       'https://example.com:8080',
       'wss://example.com:8080/ws',
     ],
     [
-      '?https://0.0.0.0/ws',
+      '?hostname=%3A%3A',
       'https://example.com:8080',
       'wss://example.com:8080/ws',
     ],
-    ['?http://localhost/ws', 'http://localhost', 'ws://localhost/ws'],
     [
-      '?http://localhost:8080/ws',
-      'http://localhost:8080',
-      'ws://localhost:8080/ws',
+      '?pathname=/custom-ws',
+      'http://example.com',
+      'ws://example.com/custom-ws',
     ],
     [
-      '?https://localhost:8080/ws',
-      'https://localhost:8080',
-      'wss://localhost:8080/ws',
+      '?protocol=wss:&username=user&password=password&hostname=localhost&port=8080&pathname=/ws',
+      'http://user:password@localhost/',
+      'wss://user:password@localhost:8080/ws',
+    ],
+    [null, 'http://example.com', 'ws://example.com/ws'],
+    [null, 'https://example.com', 'wss://example.com/ws'],
+    [null, 'http://example.com:8080', 'ws://example.com:8080/ws'],
+    [null, 'http://example.com/foo/bar', 'ws://example.com/ws'],
+    [
+      null,
+      'http://user:password@localhost/',
+      'ws://user:password@localhost/ws',
+    ],
+    [null, 'http://user@localhost:8080/', 'ws://user@localhost:8080/ws'],
+    [
+      null,
+      'http://user:password@localhost:8080/',
+      'ws://user:password@localhost:8080/ws',
     ],
     [null, 'https://localhost:8080', 'wss://localhost:8080/ws'],
-    ['?http://127.0.0.1/ws', 'http://something.com', 'ws://127.0.0.1/ws'],
-    ['?http://127.0.0.1/ws', 'https://something.com', 'ws://127.0.0.1/ws'],
-    ['?https://127.0.0.1/ws', 'http://something.com', 'wss://127.0.0.1/ws'],
     [null, 'http://127.0.0.1', 'ws://127.0.0.1/ws'],
     [null, 'http://127.0.0.1:8080', 'ws://127.0.0.1:8080/ws'],
     [null, 'https://127.0.0.1', 'wss://127.0.0.1/ws'],
-    ['?http://[::]/ws', 'http://something.com', 'ws://something.com/ws'],
-    ['?http://[::]/ws', 'https://something.com', 'wss://something.com/ws'],
-    ['?http://[::1]:8080/ws', 'http://[::1]:8080/', 'ws://[::1]:8080/ws'],
-    ['?https://[::1]:8080/ws', 'http://[::1]:8080/', 'wss://[::1]:8080/ws'],
     [null, 'http://[::1]:8080/ws', 'ws://[::1]:8080/ws'],
     [null, 'https://[::1]:8080/ws', 'wss://[::1]:8080/ws'],
     [null, 'file:///home/user/project/index.html', 'ws://localhost/ws'],
diff --git a/test/client/utils/parseURL.test.js b/test/client/utils/parseURL.test.js
deleted file mode 100644
index f6c7a060a7..0000000000
--- a/test/client/utils/parseURL.test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-'use strict';
-
-describe("'parseURL' function", () => {
-  const samples = [
-    'test',
-    '/',
-    'https://example.com',
-    'https://example.com/path',
-    'https://example.com/path/foo.js',
-    'http://user:password@localhost/',
-    'http://0.0.0.0',
-    'https://localhost:123',
-    'http://user:pass@[::]:8080',
-    'http://127.0.0.1',
-    'file://filename',
-    // eslint-disable-next-line no-undefined
-    undefined,
-  ];
-
-  samples.forEach((url) => {
-    jest.doMock(
-      '../../../client-src/utils/getCurrentScriptSource.js',
-      () => () => url
-    );
-
-    const parseURL = require('../../../client-src/utils/parseURL');
-
-    test(`should return the url when __resourceQuery is '${url}'`, () => {
-      expect(parseURL(url && `?${url}`)).toMatchSnapshot();
-    });
-
-    test(`should return the url when the current script source is '${url}'`, () => {
-      expect(parseURL()).toMatchSnapshot();
-    });
-
-    // put here because resetModules mustn't be reset when L20 is finished
-    jest.resetModules();
-  });
-});
diff --git a/test/e2e/web-socket-server-url.test.js b/test/e2e/web-socket-server-url.test.js
index 1cc9f4b927..a7866d6810 100644
--- a/test/e2e/web-socket-server-url.test.js
+++ b/test/e2e/web-socket-server-url.test.js
@@ -1389,9 +1389,13 @@ describe('web socket server URL', () => {
       const compiler = webpack(config);
       const devServerOptions = {
         client: {
-          webSocketURL: {
-            password: 'chuntaro',
-          },
+          webSocketURL:
+            webSocketServer === 'ws'
+              ? {
+                  username: 'foo',
+                  password: 'chuntaro',
+                }
+              : {},
         },
         webSocketServer,
         port: port1,
@@ -1450,7 +1454,7 @@ describe('web socket server URL', () => {
       expect(webSocketRequest.url).toContain(
         // "sockjs" has bug with parsing URL
         webSocketServer === 'ws'
-          ? `${websocketURLProtocol}://:chuntaro@127.0.0.1:${port1}/ws`
+          ? `${websocketURLProtocol}://foo:chuntaro@127.0.0.1:${port1}/ws`
           : `${websocketURLProtocol}://127.0.0.1:${port1}/ws`
       );
       expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
diff --git a/test/server/__snapshots__/Server.test.js.snap.webpack4 b/test/server/__snapshots__/Server.test.js.snap.webpack4
index 58d66ff2f7..7776d191d6 100644
--- a/test/server/__snapshots__/Server.test.js.snap.webpack4
+++ b/test/server/__snapshots__/Server.test.js.snap.webpack4
@@ -4,7 +4,7 @@ exports[`Server DevServerPlugin add hot option 1`] = `
 Array [
   Array [
     "client",
-    "index.js?ws%3A%2F%2Flocalhost%3A8124%2Fws",
+    "index.js?protocol=ws%3A&hostname=localhost&port=8124&pathname=%2Fws",
   ],
   Array [
     "node_modules",
@@ -22,7 +22,7 @@ exports[`Server DevServerPlugin add hot-only option 1`] = `
 Array [
   Array [
     "client",
-    "index.js?ws%3A%2F%2Flocalhost%3A8124%2Fws",
+    "index.js?protocol=ws%3A&hostname=localhost&port=8124&pathname=%2Fws",
   ],
   Array [
     "node_modules",
@@ -40,7 +40,7 @@ exports[`Server DevServerPlugin should create and run server with old parameters
 Array [
   Array [
     "client",
-    "index.js?ws%3A%2F%2Flocalhost%3A8124%2Fws",
+    "index.js?protocol=ws%3A&hostname=localhost&port=8124&pathname=%2Fws",
   ],
   Array [
     "node_modules",
diff --git a/test/server/__snapshots__/Server.test.js.snap.webpack5 b/test/server/__snapshots__/Server.test.js.snap.webpack5
index 58d66ff2f7..7776d191d6 100644
--- a/test/server/__snapshots__/Server.test.js.snap.webpack5
+++ b/test/server/__snapshots__/Server.test.js.snap.webpack5
@@ -4,7 +4,7 @@ exports[`Server DevServerPlugin add hot option 1`] = `
 Array [
   Array [
     "client",
-    "index.js?ws%3A%2F%2Flocalhost%3A8124%2Fws",
+    "index.js?protocol=ws%3A&hostname=localhost&port=8124&pathname=%2Fws",
   ],
   Array [
     "node_modules",
@@ -22,7 +22,7 @@ exports[`Server DevServerPlugin add hot-only option 1`] = `
 Array [
   Array [
     "client",
-    "index.js?ws%3A%2F%2Flocalhost%3A8124%2Fws",
+    "index.js?protocol=ws%3A&hostname=localhost&port=8124&pathname=%2Fws",
   ],
   Array [
     "node_modules",
@@ -40,7 +40,7 @@ exports[`Server DevServerPlugin should create and run server with old parameters
 Array [
   Array [
     "client",
-    "index.js?ws%3A%2F%2Flocalhost%3A8124%2Fws",
+    "index.js?protocol=ws%3A&hostname=localhost&port=8124&pathname=%2Fws",
   ],
   Array [
     "node_modules",
diff --git a/test/server/client-option.test.js b/test/server/client-option.test.js
index a8c1255780..47772606d7 100644
--- a/test/server/client-option.test.js
+++ b/test/server/client-option.test.js
@@ -216,10 +216,6 @@ describe('client option', () => {
     ];
 
     describe('passed to server', () => {
-      beforeAll(() => {
-        jest.unmock('../../lib/utils/getSocketClientPath');
-      });
-
       clientModes.forEach((data) => {
         it(`${data.title} ${
           data.shouldThrow ? 'should throw' : 'should not throw'
diff --git a/test/server/utils/DevServerPlugin.test.js b/test/server/utils/DevServerPlugin.test.js
index 6e0075cd72..67a6a45283 100644
--- a/test/server/utils/DevServerPlugin.test.js
+++ b/test/server/utils/DevServerPlugin.test.js
@@ -265,4 +265,86 @@ describe('DevServerPlugin util', () => {
 
     expect(typeof entries === 'function').toBe(true);
   });
+
+  // 'npm run prepare' must be done for this test to pass
+  const sockjsClientPath = require.resolve(
+    '../../../client/clients/SockJSClient'
+  );
+
+  describe('getWebsocketTransport', () => {
+    it("should work with client.transport: 'sockjs'", () => {
+      let result;
+
+      expect(() => {
+        const devServerPlugin = new DevServerPlugin({
+          client: {
+            transport: 'sockjs',
+          },
+          webSocketServer: 'sockjs',
+        });
+
+        result = devServerPlugin.getWebsocketTransport();
+      }).not.toThrow();
+
+      expect(result).toEqual(sockjsClientPath);
+    });
+
+    it('should work with client.transport: SockJSClient full path', () => {
+      let result;
+
+      expect(() => {
+        const devServerPlugin = new DevServerPlugin({
+          client: {
+            transport: sockjsClientPath,
+          },
+          webSocketServer: 'sockjs',
+        });
+
+        result = devServerPlugin.getWebsocketTransport();
+      }).not.toThrow();
+
+      expect(result).toEqual(sockjsClientPath);
+    });
+
+    it('should throw with client.transport: bad path', () => {
+      expect(() => {
+        const devServerPlugin = new DevServerPlugin({
+          client: {
+            transport: '/bad/path/to/implementation',
+          },
+          webSocketServer: 'sockjs',
+        });
+
+        devServerPlugin.getWebsocketTransport();
+      }).toThrow(/client.transport must be a string/);
+    });
+
+    it('should throw with transportMode.client: bad type', () => {
+      expect(() => {
+        const devServerPlugin = new DevServerPlugin({
+          client: {
+            transport: 1,
+          },
+          webSocketServer: 'sockjs',
+        });
+
+        devServerPlugin.getWebsocketTransport();
+      }).toThrow(/client.transport must be a string/);
+    });
+
+    it('should throw with client.transport: unimplemented client', () => {
+      expect(() => {
+        const devServerPlugin = new DevServerPlugin({
+          client: {
+            transport: 'foo',
+          },
+          webSocketServer: 'sockjs',
+        });
+
+        devServerPlugin.getWebsocketTransport();
+      }).toThrow(
+        'When you use custom web socket implementation you must explicitly specify client.transport'
+      );
+    });
+  });
 });
diff --git a/test/server/utils/getSocketClientPath.test.js b/test/server/utils/getSocketClientPath.test.js
deleted file mode 100644
index ca9b5daebd..0000000000
--- a/test/server/utils/getSocketClientPath.test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-'use strict';
-
-const getSocketClientPath = require('../../../lib/utils/getSocketClientPath');
-// 'npm run prepare' must be done for this test to pass
-const sockjsClientPath = require.resolve(
-  '../../../client/clients/SockJSClient'
-);
-
-describe('getSocketClientPath', () => {
-  it("should work with client.transport: 'sockjs'", () => {
-    let result;
-
-    expect(() => {
-      result = getSocketClientPath({
-        client: {
-          transport: 'sockjs',
-        },
-        webSocketServer: 'sockjs',
-      });
-    }).not.toThrow();
-
-    expect(result).toEqual(sockjsClientPath);
-  });
-
-  it('should work with client.transport: SockJSClient full path', () => {
-    let result;
-
-    expect(() => {
-      result = getSocketClientPath({
-        client: {
-          transport: sockjsClientPath,
-        },
-        webSocketServer: 'sockjs',
-      });
-    }).not.toThrow();
-
-    expect(result).toEqual(sockjsClientPath);
-  });
-
-  it('should throw with client.transport: bad path', () => {
-    expect(() => {
-      getSocketClientPath({
-        client: {
-          transport: '/bad/path/to/implementation',
-        },
-        webSocketServer: 'sockjs',
-      });
-    }).toThrow(/client.transport must be a string/);
-  });
-
-  it('should throw with transportMode.client: bad type', () => {
-    expect(() => {
-      getSocketClientPath({
-        client: {
-          transport: 1,
-        },
-        webSocketServer: 'sockjs',
-      });
-    }).toThrow(/client.transport must be a string/);
-  });
-
-  it('should throw with client.transport: unimplemented client', () => {
-    expect(() => {
-      getSocketClientPath({
-        client: {
-          transport: 'foo',
-        },
-        webSocketServer: 'sockjs',
-      });
-    }).toThrow(
-      'When you use custom web socket implementation you must explicitly specify client.transport'
-    );
-  });
-});