diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts
index 13c26ba665..e68bec7e26 100644
--- a/packages/backend/test/unit/FetchInstanceMetadataService.ts
+++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts
@@ -75,7 +75,7 @@ describe('FetchInstanceMetadataService', () => {
 	});
 
 	afterEach(async () => {
-		await instancesRepository.delete({});
+		await instancesRepository.deleteAll();
 		cacheManagementService.clear();
 	});
 
diff --git a/packages/backend/test/unit/FileInfoService.ts b/packages/backend/test/unit/FileInfoService.ts
index 6f0a0c4452..6eae604bf6 100644
--- a/packages/backend/test/unit/FileInfoService.ts
+++ b/packages/backend/test/unit/FileInfoService.ts
@@ -11,13 +11,13 @@ import { dirname } from 'node:path';
 import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
 import { afterAll, beforeAll, describe, test } from '@jest/globals';
+import type { MockMetadata } from 'jest-mock';
 import { GlobalModule } from '@/GlobalModule.js';
 import { FileInfo, FileInfoService } from '@/core/FileInfoService.js';
 //import { DI } from '@/di-symbols.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type { TestingModule } from '@nestjs/testing';
 import { CoreModule } from '@/core/CoreModule.js';
-import type { MockMetadata } from 'jest-mock';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
diff --git a/packages/backend/test/unit/SigninWithPasskeyApiService.ts b/packages/backend/test/unit/SigninWithPasskeyApiService.ts
index 6ddf4980a9..3692e00315 100644
--- a/packages/backend/test/unit/SigninWithPasskeyApiService.ts
+++ b/packages/backend/test/unit/SigninWithPasskeyApiService.ts
@@ -128,8 +128,8 @@ describe('SigninWithPasskeyApiService', () => {
 	});
 
 	afterEach(async () => {
-		await userProfilesRepository.delete({});
-		await usersRepository.delete({});
+		await userProfilesRepository.deleteAll();
+		await usersRepository.deleteAll();
 		cacheManagementService.clear();
 	});
 
diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index c7e655c687..396c926f2b 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -192,7 +192,7 @@ describe('ActivityPub', () => {
 
 	beforeEach(async () => {
 		// This will cascade-delete everything else
-		await usersRepository.delete({});
+		await usersRepository.deleteAll();
 
 		// Clear all caches app-wide
 		cacheManagementService.clear();
diff --git a/packages/backend/test/unit/chart.ts b/packages/backend/test/unit/chart.ts
index eccf5b2a02..91df5e1bcb 100644
--- a/packages/backend/test/unit/chart.ts
+++ b/packages/backend/test/unit/chart.ts
@@ -84,7 +84,7 @@ describe('Chart', () => {
 		];
 
 		for (const entity of entities) {
-			await db.getRepository(entity).delete({});
+			await db.getRepository(entity).deleteAll();
 		}
 	});
 
diff --git a/packages/backend/test/unit/entities/UserEntityService.ts b/packages/backend/test/unit/entities/UserEntityService.ts
index ac94350a1a..8b8a00ae8d 100644
--- a/packages/backend/test/unit/entities/UserEntityService.ts
+++ b/packages/backend/test/unit/entities/UserEntityService.ts
@@ -142,14 +142,14 @@ describe('UserEntityService', () => {
 		});
 
 		afterEach(async () => {
-			await userProfileRepository.delete({});
-			await userMemosRepository.delete({});
-			await followingRepository.delete({});
-			await followingRequestRepository.delete({});
-			await blockingRepository.delete({});
-			await mutingRepository.delete({});
-			await renoteMutingsRepository.delete({});
-			await usersRepository.delete({});
+			await userProfileRepository.deleteAll();
+			await userMemosRepository.deleteAll();
+			await followingRepository.deleteAll();
+			await followingRequestRepository.deleteAll();
+			await blockingRepository.deleteAll();
+			await mutingRepository.deleteAll();
+			await renoteMutingsRepository.deleteAll();
+			await usersRepository.deleteAll();
 			cacheManagementService.clear();
 		});
 
diff --git a/packages/backend/src/server/api/endpoints/notes/create.test.ts b/packages/backend/test/unit/server/api/endpoints/notes/create.test.ts
similarity index 100%
rename from packages/backend/src/server/api/endpoints/notes/create.test.ts
rename to packages/backend/test/unit/server/api/endpoints/notes/create.test.ts