diff --git a/src/lib/app.test.js b/src/lib/app.test.ts
similarity index 87%
rename from src/lib/app.test.js
rename to src/lib/app.test.ts
index a596a3f22a..7f98672ddf 100644
--- a/src/lib/app.test.js
+++ b/src/lib/app.test.ts
@@ -1,7 +1,5 @@
-'use strict';
-
-const express = require('express');
-const { createTestConfig } = require('../test/config/test-config');
+import express from 'express';
+import { createTestConfig } from '../test/config/test-config';
 
 jest.mock(
     './routes',
diff --git a/src/test/e2e/helpers/database-config.js b/src/test/e2e/helpers/database-config.js
deleted file mode 100644
index 4f97aef62a..0000000000
--- a/src/test/e2e/helpers/database-config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-const parseDbUrl = require('parse-database-url');
-
-module.exports = {
-    getDb: () => {
-        const url =
-            process.env.TEST_DATABASE_URL ||
-            'postgres://unleash_user:passord@localhost:5432/unleash_test';
-        return parseDbUrl(url);
-    },
-};
diff --git a/src/test/e2e/helpers/database-config.ts b/src/test/e2e/helpers/database-config.ts
new file mode 100644
index 0000000000..bbe0ba8086
--- /dev/null
+++ b/src/test/e2e/helpers/database-config.ts
@@ -0,0 +1,8 @@
+import parseDbUrl from 'parse-database-url';
+
+export const getDbConfig = (): object => {
+    const url =
+        process.env.TEST_DATABASE_URL ||
+        'postgres://unleash_user:passord@localhost:5432/unleash_test';
+    return parseDbUrl(url);
+};
diff --git a/src/test/e2e/helpers/database-init.ts b/src/test/e2e/helpers/database-init.ts
index 4bc7e143dc..16961fc5fb 100644
--- a/src/test/e2e/helpers/database-init.ts
+++ b/src/test/e2e/helpers/database-init.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from 'events';
 import { migrateDb } from '../../../migrator';
 import { createStores } from '../../../lib/db';
 import { createDb } from '../../../lib/db/db-pool';
-import dbConfig from './database-config';
+import { getDbConfig } from './database-config';
 import { createTestConfig } from '../../config/test-config';
 import dbState from './database.json';
 import { LogProvider } from '../../../lib/logger';
@@ -77,12 +77,12 @@ export interface ITestDb {
 }
 
 export default async function init(
-    databaseSchema: String = 'test',
+    databaseSchema: string = 'test',
     getLogger: LogProvider = noLoggerProvider,
 ): Promise<ITestDb> {
     const config = createTestConfig({
         db: {
-            ...dbConfig.getDb(),
+            ...getDbConfig(),
             pool: { min: 2, max: 8 },
             schema: databaseSchema,
             ssl: false,
diff --git a/src/test/fixtures/permissions.js b/src/test/fixtures/permissions.ts
similarity index 69%
rename from src/test/fixtures/permissions.js
rename to src/test/fixtures/permissions.ts
index a0adcdd5d0..1d5fa43874 100644
--- a/src/test/fixtures/permissions.js
+++ b/src/test/fixtures/permissions.ts
@@ -1,7 +1,4 @@
-'use strict';
-
-module.exports = () => {
-    const _perms = ['ADMIN'];
+const adminUser = (): { hook: (app: any) => void } => {
     return {
         hook(app) {
             app.use((req, res, next) => {
@@ -9,10 +6,12 @@ module.exports = () => {
                     isAPI: true,
                     id: 1,
                     email: 'unknown',
-                    permissions: _perms,
+                    permissions: ['ADMIN'],
                 };
                 next();
             });
         },
     };
 };
+
+export default adminUser;