diff --git a/packages/backend-core/src/db/db.ts b/packages/backend-core/src/db/db.ts
index c54a4faea4..bd6b5e13c1 100644
--- a/packages/backend-core/src/db/db.ts
+++ b/packages/backend-core/src/db/db.ts
@@ -6,12 +6,6 @@ import { DatabaseImpl } from "../db"
 const dbList = new Set()
 
 export function getDB(dbName?: string, opts?: any): Database {
-  // TODO: once using the test image, need to remove this
-  // if (env.isTest()) {
-  //   dbList.add(dbName)
-  //   // @ts-ignore
-  //   return getPouchDB(dbName, opts)
-  // }
   return new DatabaseImpl(dbName, opts)
 }
 
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 06e7dc8a57..08482dbfca 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -319,10 +319,7 @@ async function performAppCreate(ctx: BBContext) {
   const response = await db.put(newApplication, { force: true })
   newApplication._rev = response.rev
 
-  /* istanbul ignore next */
-  if (!env.isTest()) {
-    await createApp(appId)
-  }
+  await createApp(appId)
 
   await cache.app.invalidateAppMetadata(appId, newApplication)
   return newApplication
@@ -499,9 +496,7 @@ async function destroyApp(ctx: BBContext) {
   await quotas.removeApp()
   await events.app.deleted(app)
 
-  if (!env.isTest()) {
-    await deleteApp(appId)
-  }
+  await deleteApp(appId)
 
   await removeAppFromUserRoles(ctx, appId)
   await cache.app.invalidateAppMetadata(devAppId)
diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts
index 26f73e3119..9b60282897 100644
--- a/packages/server/src/tests/jestEnv.ts
+++ b/packages/server/src/tests/jestEnv.ts
@@ -3,11 +3,6 @@ import { tmpdir } from "os"
 
 env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
-env._set("CLIENT_ID", "test-client-id")
 // @ts-ignore
 env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
 env._set("LOG_LEVEL", "silent")
-env._set("PORT", 0)
-env._set("MINIO_URL", "http://localhost")
-env._set("MINIO_ACCESS_KEY", "test")
-env._set("MINIO_SECRET_KEY", "test")
diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts
index 8ca0667fc3..c97d2ae69d 100644
--- a/packages/server/src/tests/jestSetup.ts
+++ b/packages/server/src/tests/jestSetup.ts
@@ -1,11 +1,5 @@
 import env from "../environment"
 import { env as coreEnv } from "@budibase/backend-core"
-import { mocks } from "@budibase/backend-core/tests"
-
-// mock all dates to 2020-01-01T00:00:00.000Z
-// use tk.reset() to use real dates in individual tests
-const tk = require("timekeeper")
-tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.DEBUG) {
   global.console.log = jest.fn() // console.log are ignored in tests