diff --git a/src/modules/user/tests/infrastructure/InMemorySessionStore.ts b/src/modules/user/tests/infrastructure/InMemorySessionStore.ts
index a41d59cf..800e7c70 100644
--- a/src/modules/user/tests/infrastructure/InMemorySessionStore.ts
+++ b/src/modules/user/tests/infrastructure/InMemorySessionStore.ts
@@ -7,8 +7,18 @@ import {
  * In-memory implementation of NodeSavedSessionStore for testing
  */
 export class InMemorySessionStore implements NodeSavedSessionStore {
+  private static instance: InMemorySessionStore;
   private sessions: Map<string, NodeSavedSession> = new Map();
 
+  private constructor() {}
+
+  public static getInstance(): InMemorySessionStore {
+    if (!InMemorySessionStore.instance) {
+      InMemorySessionStore.instance = new InMemorySessionStore();
+    }
+    return InMemorySessionStore.instance;
+  }
+
   async get(key: string): Promise<NodeSavedSession | undefined> {
     return this.sessions.get(key);
   }
diff --git a/src/modules/user/tests/infrastructure/InMemoryStateStore.ts b/src/modules/user/tests/infrastructure/InMemoryStateStore.ts
index f38ab692..8a94bcb3 100644
--- a/src/modules/user/tests/infrastructure/InMemoryStateStore.ts
+++ b/src/modules/user/tests/infrastructure/InMemoryStateStore.ts
@@ -7,8 +7,18 @@ import {
  * In-memory implementation of NodeSavedStateStore for testing
  */
 export class InMemoryStateStore implements NodeSavedStateStore {
+  private static instance: InMemoryStateStore;
   private states: Map<string, NodeSavedState> = new Map();
 
+  private constructor() {}
+
+  public static getInstance(): InMemoryStateStore {
+    if (!InMemoryStateStore.instance) {
+      InMemoryStateStore.instance = new InMemoryStateStore();
+    }
+    return InMemoryStateStore.instance;
+  }
+
   async get(key: string): Promise<NodeSavedState | undefined> {
     return this.states.get(key);
   }