diff --git a/test/e2e/__snapshots__/client.test.js.snap.webpack4 b/test/e2e/__snapshots__/client.test.js.snap.webpack4
new file mode 100644
index 0000000000..d6f85f5a2f
--- /dev/null
+++ b/test/e2e/__snapshots__/client.test.js.snap.webpack4
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`client option configure client entry should disable client entry: console messages 1`] = `Array []`;
+
+exports[`client option configure client entry should disable client entry: page errors 1`] = `Array []`;
+
+exports[`client option configure client entry should disable client entry: response status 1`] = `200`;
+
+exports[`client option default behaviour responds with a 200 status code for /ws path: console messages 1`] = `Array []`;
+
+exports[`client option default behaviour responds with a 200 status code for /ws path: page errors 1`] = `Array []`;
+
+exports[`client option default behaviour responds with a 200 status code for /ws path: response status 1`] = `200`;
+
+exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: console messages 1`] = `Array []`;
+
+exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: page errors 1`] = `Array []`;
+
+exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: response status 1`] = `200`;
diff --git a/test/e2e/__snapshots__/client.test.js.snap.webpack5 b/test/e2e/__snapshots__/client.test.js.snap.webpack5
new file mode 100644
index 0000000000..d6f85f5a2f
--- /dev/null
+++ b/test/e2e/__snapshots__/client.test.js.snap.webpack5
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`client option configure client entry should disable client entry: console messages 1`] = `Array []`;
+
+exports[`client option configure client entry should disable client entry: page errors 1`] = `Array []`;
+
+exports[`client option configure client entry should disable client entry: response status 1`] = `200`;
+
+exports[`client option default behaviour responds with a 200 status code for /ws path: console messages 1`] = `Array []`;
+
+exports[`client option default behaviour responds with a 200 status code for /ws path: page errors 1`] = `Array []`;
+
+exports[`client option default behaviour responds with a 200 status code for /ws path: response status 1`] = `200`;
+
+exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: console messages 1`] = `Array []`;
+
+exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: page errors 1`] = `Array []`;
+
+exports[`client option should respect path option responds with a 200 status code for /foo/test/bar path: response status 1`] = `200`;
diff --git a/test/e2e/client.test.js b/test/e2e/client.test.js
new file mode 100644
index 0000000000..ea4d0a3cef
--- /dev/null
+++ b/test/e2e/client.test.js
@@ -0,0 +1,287 @@
+"use strict";
+
+const webpack = require("webpack");
+const Server = require("../../lib/Server");
+const config = require("../fixtures/simple-config-other/webpack.config");
+const runBrowser = require("../helpers/run-browser");
+const port = require("../ports-map")["client-option"];
+
+describe("client option", () => {
+  describe("default behaviour", () => {
+    let compiler;
+    let server;
+    let page;
+    let browser;
+    let pageErrors;
+    let consoleMessages;
+
+    beforeEach(async () => {
+      compiler = webpack(config);
+
+      server = new Server(
+        {
+          client: {
+            webSocketTransport: "sockjs",
+          },
+          webSocketServer: "sockjs",
+          port,
+        },
+        compiler
+      );
+
+      await server.start();
+
+      ({ page, browser } = await runBrowser());
+
+      pageErrors = [];
+      consoleMessages = [];
+    });
+
+    afterEach(async () => {
+      await browser.close();
+      await server.stop();
+    });
+
+    it("overlay should be true by default", () => {
+      expect(server.options.client.overlay).toBe(true);
+    });
+
+    it("responds with a 200 status code for /ws path", async () => {
+      page
+        .on("console", (message) => {
+          consoleMessages.push(message);
+        })
+        .on("pageerror", (error) => {
+          pageErrors.push(error);
+        });
+
+      const response = await page.goto(`http://127.0.0.1:${port}/ws`, {
+        waitUntil: "networkidle0",
+      });
+
+      expect(response.status()).toMatchSnapshot("response status");
+
+      expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
+        "console messages"
+      );
+
+      expect(pageErrors).toMatchSnapshot("page errors");
+    });
+  });
+
+  describe("should respect path option", () => {
+    let compiler;
+    let server;
+    let page;
+    let browser;
+    let pageErrors;
+    let consoleMessages;
+
+    beforeEach(async () => {
+      compiler = webpack(config);
+
+      server = new Server(
+        {
+          client: {
+            webSocketTransport: "sockjs",
+          },
+          webSocketServer: {
+            type: "sockjs",
+            options: {
+              host: "localhost",
+              port,
+              path: "/foo/test/bar",
+            },
+          },
+          port,
+        },
+        compiler
+      );
+
+      await server.start();
+
+      ({ page, browser } = await runBrowser());
+
+      pageErrors = [];
+      consoleMessages = [];
+    });
+
+    afterEach(async () => {
+      await browser.close();
+      await server.stop();
+    });
+
+    it("responds with a 200 status code for /foo/test/bar path", async () => {
+      page
+        .on("console", (message) => {
+          consoleMessages.push(message);
+        })
+        .on("pageerror", (error) => {
+          pageErrors.push(error);
+        });
+
+      const response = await page.goto(
+        `http://127.0.0.1:${port}/foo/test/bar`,
+        {
+          waitUntil: "networkidle0",
+        }
+      );
+
+      expect(response.status()).toMatchSnapshot("response status");
+
+      expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
+        "console messages"
+      );
+
+      expect(pageErrors).toMatchSnapshot("page errors");
+    });
+  });
+
+  describe("configure client entry", () => {
+    let compiler;
+    let server;
+    let page;
+    let browser;
+    let pageErrors;
+    let consoleMessages;
+
+    beforeEach(async () => {
+      compiler = webpack(config);
+
+      server = new Server(
+        {
+          client: false,
+          port,
+        },
+        compiler
+      );
+
+      await server.start();
+
+      ({ page, browser } = await runBrowser());
+
+      pageErrors = [];
+      consoleMessages = [];
+    });
+
+    afterEach(async () => {
+      await browser.close();
+      await server.stop();
+    });
+
+    it("should disable client entry", async () => {
+      page
+        .on("console", (message) => {
+          consoleMessages.push(message);
+        })
+        .on("pageerror", (error) => {
+          pageErrors.push(error);
+        });
+
+      const response = await page.goto(`http://127.0.0.1:${port}/main.js`, {
+        waitUntil: "networkidle0",
+      });
+
+      expect(response.status()).toMatchSnapshot("response status");
+
+      expect(await response.text()).not.toMatch(/client\/index\.js/);
+
+      expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
+        "console messages"
+      );
+
+      expect(pageErrors).toMatchSnapshot("page errors");
+    });
+  });
+
+  describe("webSocketTransport", () => {
+    const clientModes = [
+      {
+        title: 'as a string ("sockjs")',
+        client: {
+          webSocketTransport: "sockjs",
+        },
+        webSocketServer: "sockjs",
+        shouldThrow: false,
+      },
+      {
+        title: 'as a string ("ws")',
+        client: {
+          webSocketTransport: "ws",
+        },
+        webSocketServer: "ws",
+        shouldThrow: false,
+      },
+      {
+        title: 'as a path ("sockjs")',
+        client: {
+          webSocketTransport: require.resolve(
+            "../../client-src/clients/SockJSClient"
+          ),
+        },
+        webSocketServer: "sockjs",
+        shouldThrow: false,
+      },
+      {
+        title: 'as a path ("ws")',
+        client: {
+          webSocketTransport: require.resolve(
+            "../../client-src/clients/WebSocketClient"
+          ),
+        },
+        webSocketServer: "ws",
+        shouldThrow: false,
+      },
+      {
+        title: "as a nonexistent path (sockjs)",
+        client: {
+          webSocketTransport: "/bad/path/to/implementation",
+        },
+        webSocketServer: "sockjs",
+        shouldThrow: true,
+      },
+      {
+        title: "as a nonexistent path (ws)",
+        client: {
+          webSocketTransport: "/bad/path/to/implementation",
+        },
+        webSocketServer: "ws",
+        shouldThrow: true,
+      },
+    ];
+
+    describe("passed to server", () => {
+      clientModes.forEach((data) => {
+        it(`${data.title} ${
+          data.shouldThrow ? "should throw" : "should not throw"
+        }`, async () => {
+          const compiler = webpack(config);
+
+          const server = new Server(
+            {
+              client: data.client,
+              port,
+            },
+            compiler
+          );
+
+          let thrownError;
+
+          try {
+            await server.start();
+          } catch (error) {
+            thrownError = error;
+          }
+
+          if (data.shouldThrow) {
+            expect(thrownError.message).toMatch(
+              /client\.webSocketTransport must be a string/
+            );
+          }
+
+          await server.stop();
+        });
+      });
+    });
+  });
+});