diff --git a/packages/backend-core/src/middleware/errorHandling.ts b/packages/backend-core/src/middleware/errorHandling.ts
index ebdd4107e9..ae5373a2e0 100644
--- a/packages/backend-core/src/middleware/errorHandling.ts
+++ b/packages/backend-core/src/middleware/errorHandling.ts
@@ -1,5 +1,6 @@
 import { APIError } from "@budibase/types"
 import * as errors from "../errors"
+import environment from "../environment"
 
 export async function errorHandling(ctx: any, next: any) {
   try {
@@ -14,15 +15,21 @@ export async function errorHandling(ctx: any, next: any) {
       console.error(err)
     }
 
-    const error = errors.getPublicError(err)
-    const body: APIError = {
-      message: err.message,
-      status: status,
-      validationErrors: err.validation,
-      error,
+    if (environment.isTest()) {
+      ctx.body = {
+        message: err.message,
+        status: status,
+        error: errors.getPublicError(err),
+        stack: err.stack,
+      }
+    } else {
+      ctx.body = {
+        message: err.message,
+        status: status,
+        validationErrors: err.validation,
+        error: errors.getPublicError(err),
+      }
     }
-
-    ctx.body = body
   }
 }
 
diff --git a/packages/server/src/tests/utilities/api/base.ts b/packages/server/src/tests/utilities/api/base.ts
index 46fb7eb3b9..42911628fd 100644
--- a/packages/server/src/tests/utilities/api/base.ts
+++ b/packages/server/src/tests/utilities/api/base.ts
@@ -126,11 +126,27 @@ export abstract class TestAPI {
     const response = await request
 
     if (response.status !== status) {
-      throw new Error(
-        `Expected status ${status} but got ${
-          response.status
-        } with body ${JSON.stringify(response.body)}`
-      )
+      let message = `Expected status ${status} but got ${response.status}`
+
+      const stack = response.body.stack
+      delete response.body.stack
+
+      if (response.body) {
+        message += `\n\nBody:`
+        const body = JSON.stringify(response.body, null, 2)
+        for (const line of body.split("\n")) {
+          message += `\n⏐ ${line}`
+        }
+      }
+
+      if (stack) {
+        message += `\n\nStack from request handler:`
+        for (const line of stack.split("\n")) {
+          message += `\n⏐ ${line}`
+        }
+      }
+
+      throw new Error(message)
     }
 
     if (expectations?.headersNotPresent) {