diff --git a/test/integration/banListTest.ts b/test/integration/banListTest.ts
index a0320720..2aa65be4 100644
--- a/test/integration/banListTest.ts
+++ b/test/integration/banListTest.ts
@@ -11,7 +11,7 @@ import AccessControlUnit, { Access, EntityAccess } from "../../src/models/Access
 import { randomUUID } from "crypto";
 import { MatrixSendClient } from "../../src/MatrixEmitter";
 import { MatrixRoomReference } from "../../src/commands/interface-manager/MatrixRoomReference";
-import { MjolnirTestContext } from "./mjolnirSetupUtils";
+import { DraupnirTestContext } from "./mjolnirSetupUtils";
 
 /**
  * Create a policy rule in a policy room.
@@ -598,11 +598,11 @@ describe('Test: Creating policy lists.', function() {
 })
 
 describe('Test: Continue to ban other marked members when one member cannot be banned', function() {
-    it('Failing to ban a moderator should not stop other members being banned.', async function(this: MjolnirTestContext) {
-        if (this.mjolnir === undefined) {
+    it('Failing to ban a moderator should not stop other members being banned.', async function(this: DraupnirTestContext) {
+        if (this.draupnir === undefined) {
             throw new TypeError("Mjolnir was never created.")
         }
-        const mjolnir: Mjolnir = this.mjolnir;
+        const mjolnir: Mjolnir = this.draupnir;
         const moderator = await newTestUser(this.config.homeserverUrl, { name: { contains: "mx-moderator" } });
         await moderator.joinRoom(mjolnir.managementRoomId);
         const mjolnirId = await mjolnir.client.getUserId();
diff --git a/test/integration/mjolnirSetupUtils.ts b/test/integration/mjolnirSetupUtils.ts
index d1a7947d..a1bd5761 100644
--- a/test/integration/mjolnirSetupUtils.ts
+++ b/test/integration/mjolnirSetupUtils.ts
@@ -21,15 +21,18 @@ import {
     LogLevel,
     RichConsoleLogger
 } from "matrix-bot-sdk";
-import { Mjolnir}  from '../../src/Mjolnir';
 import { overrideRatelimitForUser, registerUser } from "./clientHelper";
 import { initializeSentry, patchMatrixClient } from "../../src/utils";
 import { IConfig } from "../../src/config";
+import { Draupnir } from "../../src/Draupnir";
+import { makeDraupnirBotModeFromConfig } from "../../src/DraupnirBotMode";
+import { SafeMatrixEmitterWrapper } from "matrix-protection-suite-for-matrix-bot-sdk";
+import { DefaultEventDecoder } from "matrix-protection-suite";
 
 patchMatrixClient();
 
-export interface MjolnirTestContext extends Mocha.Context {
-    mjolnir?: Mjolnir
+export interface DraupnirTestContext extends Mocha.Context {
+    draupnir?: Draupnir
 }
 
 /**
@@ -68,19 +71,19 @@ async function configureMjolnir(config: IConfig) {
     };
 }
 
-export function mjolnir(): Mjolnir | null {
+export function draupnir(): Draupnir | null {
     return globalMjolnir;
 }
-export function matrixClient(): MatrixClient | null {
+export function draupnirClient(): MatrixClient | null {
     return globalClient;
 }
 let globalClient: MatrixClient | null
-let globalMjolnir: Mjolnir | null;
+let globalMjolnir: Draupnir | null;
 
 /**
  * Return a test instance of Mjolnir.
  */
-export async function makeMjolnir(config: IConfig): Promise<Mjolnir> {
+export async function makeMjolnir(config: IConfig): Promise<Draupnir> {
     await configureMjolnir(config);
     LogService.setLogger(new RichConsoleLogger());
     LogService.setLevel(LogLevel.fromString(config.logLevel, LogLevel.DEBUG));
@@ -89,7 +92,7 @@ export async function makeMjolnir(config: IConfig): Promise<Mjolnir> {
     const client = await pantalaimon.createClientWithCredentials(config.pantalaimon.username, config.pantalaimon.password);
     await overrideRatelimitForUser(config.homeserverUrl, await client.getUserId());
     await ensureAliasedRoomExists(client, config.managementRoom);
-    let mj = await Mjolnir.setupMjolnirFromConfig(client, client, config);
+    let mj = await makeDraupnirBotModeFromConfig(client, new SafeMatrixEmitterWrapper(client, DefaultEventDecoder), config);
     globalClient = client;
     globalMjolnir = mj;
     return mj;