diff --git a/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts
index 065578c72c..9de4a96b04 100644
--- a/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts
+++ b/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts
@@ -67,7 +67,7 @@ describe("Organizations Event Types Endpoints", () => {
 
     beforeAll(async () => {
       // Generate unique slug inside beforeAll to ensure uniqueness across test runs
-      managedEventTypeSlug = `organizations-event-types-managed-${randomString()}`;
+      managedEventTypeSlug = `organizations-event-types-managed-${Date.now()}-${randomString()}`;
       const moduleRef = await withApiAuth(
         userEmail,
         Test.createTestingModule({
@@ -1381,13 +1381,14 @@ describe("Organizations Event Types Endpoints", () => {
     }
 
     afterAll(async () => {
+      await eventTypesRepositoryFixture.deleteAllUserEventTypes(teammate1.id);
+      await eventTypesRepositoryFixture.deleteAllUserEventTypes(teammate2.id);
+      await eventTypesRepositoryFixture.deleteAllTeamEventTypes(team.id);
+      await eventTypesRepositoryFixture.deleteAllTeamEventTypes(falseTestTeam.id);
       await userRepositoryFixture.deleteByEmail(userAdmin.email);
       await userRepositoryFixture.deleteByEmail(teammate1.email);
       await userRepositoryFixture.deleteByEmail(teammate2.email);
       await userRepositoryFixture.deleteByEmail(falseTestUser.email);
-      // Explicitly delete all team event types before deleting the team to ensure proper cleanup
-      await eventTypesRepositoryFixture.deleteAllTeamEventTypes(team.id);
-      await eventTypesRepositoryFixture.deleteAllTeamEventTypes(falseTestTeam.id);
       await teamsRepositoryFixture.delete(team.id);
       await teamsRepositoryFixture.delete(falseTestTeam.id);
       await organizationsRepositoryFixture.delete(org.id);
diff --git a/apps/api/v2/test/fixtures/repository/event-types.repository.fixture.ts b/apps/api/v2/test/fixtures/repository/event-types.repository.fixture.ts
index 2779065978..df7f52fb58 100644
--- a/apps/api/v2/test/fixtures/repository/event-types.repository.fixture.ts
+++ b/apps/api/v2/test/fixtures/repository/event-types.repository.fixture.ts
@@ -66,6 +66,14 @@ export class EventTypesRepositoryFixture {
     });
   }
 
+  async deleteAllUserEventTypes(userId: number) {
+    return this.prismaWriteClient.eventType.deleteMany({
+      where: {
+        userId,
+      },
+    });
+  }
+
   async findById(eventTypeId: EventType["id"]) {
     return this.prismaReadClient.eventType.findUnique({ where: { id: eventTypeId } });
   }