diff --git a/jestTestcontainersConfigGenerator.js b/jestTestcontainersConfigGenerator.js
index 6e01efea32..c74bcea1bc 100644
--- a/jestTestcontainersConfigGenerator.js
+++ b/jestTestcontainersConfigGenerator.js
@@ -1,12 +1,26 @@
-module.exports = env => ({
-  devEnv: {
-    image: "budibase/dependencies",
-    tag: "latest",
-    ports: [6379, 5984, 9000],
-    env,
-    wait: {
-      type: "text",
-      text: "Test environment started...",
-    },
-  },
-})
+
+
+module.exports = dependenciesEnv => {
+  if (process.env.DEV_TOOLS) {
+    return {
+      dockerCompose: {
+        composeFilePath: `${__dirname}/hosting`,
+        composeFile: 'docker-compose.dev.yaml',
+        startupTimeout: 10000,
+      }
+    }
+  }
+
+  return {
+    devEnv: {
+      image: "budibase/dependencies",
+      tag: "latest",
+      ports: [6379, 5984, 9000],
+      env: dependenciesEnv,
+      wait: {
+        type: "text",
+        text: "Test environment started...",
+      },
+    }
+  }
+}
diff --git a/packages/server/.env.test b/packages/server/.env.test
deleted file mode 100644
index 07f6afa889..0000000000
--- a/packages/server/.env.test
+++ /dev/null
@@ -1,7 +0,0 @@
-JWT_SECRET=testsecret
-COUCHDB_USER=test_couchdb_user
-COUCH_DB_USER=test_couchdb_user
-COUCHDB_PASSWORD=test_couchdb_password
-COUCH_DB_PASSWORD=test_couchdb_password
-MINIO_ACCESS_KEY=budibase
-MINIO_SECRET_KEY=budibase
\ No newline at end of file
diff --git a/packages/server/jest-testcontainers-config.js b/packages/server/jest-testcontainers-config.js
index 30ed1503d8..8a19389492 100644
--- a/packages/server/jest-testcontainers-config.js
+++ b/packages/server/jest-testcontainers-config.js
@@ -1,6 +1,6 @@
 const { join } = require("path")
 const { parsed: env } = require("dotenv").config({
-  path: join(__dirname, ".env.test"),
+  path: join(__dirname, "..", "..", "hosting", ".env"),
 })
 
 const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator")