diff --git a/frontend/test/__runner__/backend.js b/frontend/test/__runner__/backend.js
index 92f61818f8f6e4a16c11ae08d812b39ab37b07f3..a42d896623a39510982fcbb5dd7f32c8bf2016ea 100644
--- a/frontend/test/__runner__/backend.js
+++ b/frontend/test/__runner__/backend.js
@@ -18,22 +18,14 @@ const BackendResource = createSharedResource("BackendResource", {
   create({ dbKey }) {
     const dbFile = generateTempDbPath();
     const absoluteDbKey = dbKey ? __dirname + dbKey : dbFile;
-    const e2eHost = process.env["E2E_HOST"];
-    if (e2eHost) {
-      return {
-        dbKey: absoluteDbKey,
-        host: e2eHost,
-        process: { kill: () => {} },
-      };
-    } else {
-      const port = getPort();
-      return {
-        dbKey: absoluteDbKey,
-        dbFile: dbFile,
-        host: `http://localhost:${port}`,
-        port: port,
-      };
-    }
+    const port = getPort();
+
+    return {
+      dbKey: absoluteDbKey,
+      dbFile: dbFile,
+      host: `http://localhost:${port}`,
+      port: port,
+    };
   },
   async start(server) {
     if (!server.process) {
diff --git a/frontend/test/__runner__/run_cypress_tests.js b/frontend/test/__runner__/run_cypress_tests.js
index a391b96a5af5f2a8e389319f1718f7da4bf76726..57fe23588de106cfce2f785d75eca42ab0901e87 100644
--- a/frontend/test/__runner__/run_cypress_tests.js
+++ b/frontend/test/__runner__/run_cypress_tests.js
@@ -4,26 +4,33 @@ const getVersion = require("./cypress-runner-get-version");
 const generateSnapshots = require("./cypress-runner-generate-snapshots");
 const BackendResource = require("./backend.js");
 
+const e2eHost = process.env["E2E_HOST"];
+
 const server = BackendResource.get({ dbKey: "" });
-const baseUrl = server.host;
+const baseUrl = e2eHost || server.host;
 
 const init = async () => {
-  printBold("Metabase version info");
-  await getVersion();
+  if (!e2eHost) {
+    printBold("Metabase version info");
+    await getVersion();
 
-  printBold("Starting backend");
-  await BackendResource.start(server);
+    printBold("Starting backend");
+    await BackendResource.start(server);
 
-  printBold("Generating snapshots");
-  await generateSnapshots(baseUrl, cleanup);
+    printBold("Generating snapshots");
+    await generateSnapshots(baseUrl, cleanup);
+  }
 
   printBold("Starting Cypress");
   await runCypress(baseUrl, cleanup);
 };
 
 const cleanup = async (exitCode = 0) => {
-  printBold("Cleaning up...");
-  await BackendResource.stop(server);
+  if (!e2eHost) {
+    printBold("Cleaning up...");
+    await BackendResource.stop(server);
+  }
+
   process.exit(exitCode);
 };