diff --git a/packages/server/src/api/routes/tests/misc.spec.js b/packages/server/src/api/routes/tests/misc.spec.js
index 475176759c..21dba8f085 100644
--- a/packages/server/src/api/routes/tests/misc.spec.js
+++ b/packages/server/src/api/routes/tests/misc.spec.js
@@ -43,53 +43,55 @@ describe("run misc tests", () => {
 
   describe("test table utilities", () => {
     it("should be able to import a CSV", async () => {
-      const table = await config.createTable({
-        name: "table",
-        type: "table",
-        key: "name",
-        schema: {
-          a: {
-            type: "string",
-            constraints: {
+      return config.doInContext(null, async () => {
+        const table = await config.createTable({
+          name: "table",
+          type: "table",
+          key: "name",
+          schema: {
+            a: {
               type: "string",
+              constraints: {
+                type: "string",
+              },
+            },
+            b: {
+              type: "string",
+              constraints: {
+                type: "string",
+              },
+            },
+            c: {
+              type: "string",
+              constraints: {
+                type: "string",
+              },
+            },
+            d: {
+              type: "string",
+              constraints: {
+                type: "string",
+              },
             },
           },
-          b: {
-            type: "string",
-            constraints: {
-              type: "string",
-            },
-          },
-          c: {
-            type: "string",
-            constraints: {
-              type: "string",
-            },
-          },
-          d: {
-            type: "string",
-            constraints: {
-              type: "string",
-            },
-          },
-        },
+        })
+        const dataImport = {
+          csvString: "a,b,c,d\n1,2,3,4",
+          schema: {},
+        }
+        for (let col of ["a", "b", "c", "d"]) {
+          dataImport.schema[col] = { type: "string" }
+        }
+        await tableUtils.handleDataImport(
+          { userId: "test" },
+          table,
+          dataImport
+        )
+        const rows = await config.getRows()
+        expect(rows[0].a).toEqual("1")
+        expect(rows[0].b).toEqual("2")
+        expect(rows[0].c).toEqual("3")
       })
-      const dataImport = {
-        csvString: "a,b,c,d\n1,2,3,4",
-        schema: {},
-      }
-      for (let col of ["a", "b", "c", "d"]) {
-        dataImport.schema[col] = { type: "string" }
-      }
-      await tableUtils.handleDataImport(
-        { userId: "test" },
-        table,
-        dataImport
-      )
-      const rows = await config.getRows()
-      expect(rows[0].a).toEqual("1")
-      expect(rows[0].b).toEqual("2")
-      expect(rows[0].c).toEqual("3")
     })
   })
 })
\ No newline at end of file
diff --git a/packages/server/src/automations/tests/utilities/index.js b/packages/server/src/automations/tests/utilities/index.js
index 9fcb9a9cdf..b2e1566687 100644
--- a/packages/server/src/automations/tests/utilities/index.js
+++ b/packages/server/src/automations/tests/utilities/index.js
@@ -1,4 +1,6 @@
 const TestConfig = require("../../../tests/utilities/TestConfiguration")
+const { TENANT_ID } = require("../../../tests/utilities/structures")
+const { doInTenant } = require("@budibase/backend-core/tenancy")
 const actions = require("../../actions")
 const emitter = require("../../../events/index")
 const env = require("../../../environment")
@@ -31,14 +33,16 @@ exports.runInProd = async fn => {
 }
 
 exports.runStep = async function runStep(stepId, inputs) {
-  let step = await actions.getAction(stepId)
-  expect(step).toBeDefined()
-  return step({
-    inputs,
-    appId: config ? config.getAppId() : null,
-    // don't really need an API key, mocked out usage quota, not being tested here
-    apiKey: exports.apiKey,
-    emitter,
+  return doInTenant(TENANT_ID, async () => {
+    let step = await actions.getAction(stepId)
+    expect(step).toBeDefined()
+    return step({
+      inputs,
+      appId: config ? config.getAppId() : null,
+      // don't really need an API key, mocked out usage quota, not being tested here
+      apiKey: exports.apiKey,
+      emitter,
+    })
   })
 }