diff --git a/packages/api/test/db.ts b/packages/api/test/db.ts
index b8b77af93..51902962e 100644
--- a/packages/api/test/db.ts
+++ b/packages/api/test/db.ts
@@ -231,3 +231,13 @@ export const updateTestUser = async (userId: string, update: Partial<User>) => {
     await t.getRepository(User).update(userId, update)
   })
 }
+
+export const deleteTestDeviceTokens = async (
+  userId: string,
+  criteria: string[] | FindOptionsWhere<UserDeviceToken>
+) => {
+  await AppDataSource.transaction(async (t) => {
+    await setClaims(t, userId)
+    await t.getRepository(UserDeviceToken).delete(criteria)
+  })
+}
diff --git a/packages/api/test/resolvers/user_device_tokens.test.ts b/packages/api/test/resolvers/user_device_tokens.test.ts
index bf1201ffb..869969a8c 100644
--- a/packages/api/test/resolvers/user_device_tokens.test.ts
+++ b/packages/api/test/resolvers/user_device_tokens.test.ts
@@ -1,6 +1,7 @@
 import {
   createTestDeviceToken,
   createTestUser,
+  deleteTestDeviceTokens,
   deleteTestUser,
   getDeviceToken,
 } from '../db'
@@ -66,7 +67,7 @@ describe('Device tokens API', () => {
 
     after(async () => {
       // clean up
-      await getRepository(UserDeviceToken).delete({ user: { id: user.id } })
+      await deleteTestDeviceTokens(user.id, { user: { id: user.id } })
     })
 
     context('when id in input is not null', () => {
@@ -174,7 +175,7 @@ describe('Device tokens API', () => {
 
     after(async () => {
       // clean up
-      await getRepository(UserDeviceToken).delete({ token })
+      await deleteTestDeviceTokens(user.id, { token })
     })
 
     it('responds with status code 200 and returns all device tokens', async () => {