diff --git a/metaspace/graphql/package.json b/metaspace/graphql/package.json
index 6508da891..751a5dd8b 100644
--- a/metaspace/graphql/package.json
+++ b/metaspace/graphql/package.json
@@ -126,6 +126,7 @@
       "node"
     ],
     "testEnvironment": "node",
+    "testTimeout": 15000,
     "setupFilesAfterEnv": [
       "<rootDir>/src/tests/setupTestFramework.ts"
     ],
diff --git a/metaspace/graphql/src/tests/globalSetup.ts b/metaspace/graphql/src/tests/globalSetup.ts
index 6294bc0f9..2ba1684b2 100644
--- a/metaspace/graphql/src/tests/globalSetup.ts
+++ b/metaspace/graphql/src/tests/globalSetup.ts
@@ -3,7 +3,7 @@ import config from '../utils/config';
 import {createConnection} from '../utils/db';
 import {DbSchemaName}  from '../utils/typeOrmConfig';
 
-module.exports = async () => {
+export = async () => {
 
   if (config.db.database === 'sm'
     || config.util.getConfigSources().some(({name}) => name.endsWith('development.js') || name.endsWith('production.js'))) {
diff --git a/metaspace/graphql/src/tests/globalTeardown.ts b/metaspace/graphql/src/tests/globalTeardown.ts
index d87ab03f6..03ae4cbd6 100644
--- a/metaspace/graphql/src/tests/globalTeardown.ts
+++ b/metaspace/graphql/src/tests/globalTeardown.ts
@@ -1,7 +1,7 @@
 import * as Knex from 'knex';
 import config from '../utils/config';
 
-module.exports = async () => {
+export = async () => {
   const knexAdmin = Knex({
     client: 'postgres',
     connection: {