diff --git a/jest.config.js b/jest.config.js
index add640645..f000eb08e 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +1,7 @@
 /** @type {import('jest').Config} */
 const customJestConfig = {
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
-  globalSetup: './test/jest.setup.ts',
+  setupFilesAfterEnv: ['./test/jest.setup.ts'],
   moduleNameMapper: {
     '\\.(css|scss)$': '<rootDir>/test/helpers/mocks/emptyModule.js',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
diff --git a/test/jest.setup.ts b/test/jest.setup.ts
index 8c965046e..16fa08366 100644
--- a/test/jest.setup.ts
+++ b/test/jest.setup.ts
@@ -1,12 +1,21 @@
-module.exports = () => {
-  process.env.PAYLOAD_DISABLE_ADMIN = 'true'
-  process.env.PAYLOAD_DROP_DATABASE = 'true'
+import { createTestHooks } from './testHooks.js'
 
-  if (process.env.PAYLOAD_DATABASE) {
-    console.log('\n\nUsing database:', process.env.PAYLOAD_DATABASE)
-  } else {
-    console.log('\n\nNo database specified, using default')
-  }
+let afterTest: () => Promise<void> | undefined
+beforeAll(async () => {
+  ;({ afterTest } = await createTestHooks())
+})
 
-  process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER = 's3'
+process.env.PAYLOAD_DISABLE_ADMIN = 'true'
+process.env.PAYLOAD_DROP_DATABASE = 'true'
+
+if (process.env.PAYLOAD_DATABASE) {
+  console.log('\n\nUsing database:', process.env.PAYLOAD_DATABASE)
+} else {
+  console.log('\n\nNo database specified, using default')
 }
+
+process.env.PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER = 's3'
+
+afterAll(async () => {
+  await afterTest()
+})