diff --git a/jest.config.js b/jest.config.js
index 830329212f..aab1988db2 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,11 +2,14 @@ module.exports = {
   verbose: true,
   testEnvironment: 'node',
   globalSetup: '<rootDir>/tests/api/globalSetup.js',
-  globalTeardown: '<rootDir>/tests/api/globalTeardown.js',
   testPathIgnorePatterns: [
     'node_modules',
     'src/admin/*',
     'dist',
   ],
   testTimeout: 15000,
+  moduleNameMapper: {
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/webpack/mocks/fileMock.js',
+    '\\.(css|scss)$': '<rootDir>/src/webpack/mocks/emptyModule.js',
+  },
 };
diff --git a/package.json b/package.json
index 42c3af6926..0fb7b15f4d 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,8 @@
     "lint": "eslint .",
     "test": "yarn test:int && yarn test:client",
     "pretest": "tsc-silent --project tsconfig.json --suppress @",
-    "test:int": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.js NODE_ENV=test DISABLE_LOGGING=true jest --forceExit --runInBand",
-    "test:client": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.js NODE_ENV=test jest --config=jest.react.config.js"
+    "test:int": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.ts NODE_ENV=test DISABLE_LOGGING=true jest --forceExit --runInBand",
+    "test:client": "cross-env PAYLOAD_CONFIG_PATH=demo/payload.config.ts NODE_ENV=test jest --config=jest.react.config.js"
   },
   "dependencies": {
     "@babel/cli": "^7.12.8",
diff --git a/src/config/load.ts b/src/config/load.ts
index 91ed138878..5d9270c9c4 100644
--- a/src/config/load.ts
+++ b/src/config/load.ts
@@ -7,6 +7,7 @@ import findConfig from './find';
 const removedExtensions = ['.scss', '.css', '.svg', '.png', '.jpg', '.eot', '.ttf', '.woff', '.woff2'];
 
 const configPath = findConfig();
+
 const loadConfig = (): PayloadConfig => {
   removedExtensions.forEach((ext) => {
     require.extensions[ext] = () => null;
diff --git a/tests/api/globalSetup.js b/tests/api/globalSetup.js
index c9827be923..075f4979a7 100644
--- a/tests/api/globalSetup.js
+++ b/tests/api/globalSetup.js
@@ -1,14 +1,12 @@
 require('isomorphic-fetch');
+require('../../demo/server');
 
-const server = require('../../demo/server');
 const loadConfig = require('../../src/config/load').default;
 const { email, password } = require('./credentials');
 
 const { serverURL } = loadConfig();
 
 const globalSetup = async () => {
-  global.PAYLOAD_SERVER = server.start();
-
   const response = await fetch(`${serverURL}/api/admins/first-register`, {
     body: JSON.stringify({
       email,
diff --git a/tests/api/globalTeardown.js b/tests/api/globalTeardown.js
deleted file mode 100644
index 2eb33ddb12..0000000000
--- a/tests/api/globalTeardown.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const globalTeardown = async () => {
-  const serverClosePromise = new Promise((resolve) => global.PAYLOAD_SERVER.close(resolve));
-  await serverClosePromise;
-};
-
-module.exports = globalTeardown;