diff --git a/packages/backend-core/tests/extra/DBTestConfiguration.ts b/packages/backend-core/tests/extra/DBTestConfiguration.ts
index a2550a6e24..99a5bcba46 100644
--- a/packages/backend-core/tests/extra/DBTestConfiguration.ts
+++ b/packages/backend-core/tests/extra/DBTestConfiguration.ts
@@ -18,7 +18,7 @@ class DBTestConfiguration {
 
   // TENANCY
 
-  doInTenant(task: any) {
+  doInTenant<T>(task: () => Promise<T>) {
     return context.doInTenant(this.tenantId, () => {
       return task()
     })
diff --git a/packages/backend-core/tests/index.ts b/packages/backend-core/tests/index.ts
index 50fc1dc431..cdbacc12d8 100644
--- a/packages/backend-core/tests/index.ts
+++ b/packages/backend-core/tests/index.ts
@@ -1 +1,2 @@
 export * from "./core/utilities"
+export * from "./extra"