diff --git a/test/private-api/alias.e2e-spec.ts b/test/private-api/alias.e2e-spec.ts
index 0d34d896a..94cb27919 100644
--- a/test/private-api/alias.e2e-spec.ts
+++ b/test/private-api/alias.e2e-spec.ts
@@ -41,6 +41,10 @@ describe('Alias', () => {
       .expect(201);
   });
 
+  afterAll(async () => {
+    await testSetup.cleanup();
+  });
+
   describe('POST /alias', () => {
     const testAlias = 'aliasTest';
     const newAliasDto: AliasCreateDto = {
diff --git a/test/private-api/auth.e2e-spec.ts b/test/private-api/auth.e2e-spec.ts
index 236ae4dd9..4f2218f29 100644
--- a/test/private-api/auth.e2e-spec.ts
+++ b/test/private-api/auth.e2e-spec.ts
@@ -38,6 +38,10 @@ describe('Auth', () => {
     password = 'test_password';
   });
 
+  afterAll(async () => {
+    await testSetup.cleanup();
+  });
+
   describe('POST /auth/local', () => {
     it('works', async () => {
       const registrationDto: RegisterDto = {
diff --git a/test/private-api/groups.e2e-spec.ts b/test/private-api/groups.e2e-spec.ts
index 5b8f888dc..127bf5496 100644
--- a/test/private-api/groups.e2e-spec.ts
+++ b/test/private-api/groups.e2e-spec.ts
@@ -34,6 +34,7 @@ describe('Groups', () => {
 
   afterEach(async () => {
     await testSetup.app.close();
+    await testSetup.cleanup();
   });
 
   test('details for existing groups can be retrieved', async () => {
diff --git a/test/private-api/history.e2e-spec.ts b/test/private-api/history.e2e-spec.ts
index 1fe1c8af2..b3fa704ac 100644
--- a/test/private-api/history.e2e-spec.ts
+++ b/test/private-api/history.e2e-spec.ts
@@ -58,6 +58,11 @@ describe('History', () => {
       .expect(201);
   });
 
+  afterAll(async () => {
+    await testSetup.app.close();
+    await testSetup.cleanup();
+  });
+
   it('GET /me/history', async () => {
     const emptyResponse = await agent
       .get('/api/private/me/history')
@@ -219,8 +224,4 @@ describe('History', () => {
     expect(userEntryDto.pinStatus).toEqual(entryDto.pinStatus);
     expect(userEntryDto.lastVisitedAt).toEqual(entryDto.lastVisitedAt);
   });
-
-  afterAll(async () => {
-    await testSetup.app.close();
-  });
 });
diff --git a/test/private-api/me.e2e-spec.ts b/test/private-api/me.e2e-spec.ts
index 5a7a73d92..f729b820c 100644
--- a/test/private-api/me.e2e-spec.ts
+++ b/test/private-api/me.e2e-spec.ts
@@ -49,6 +49,10 @@ describe('Me', () => {
       .expect(201);
   });
 
+  afterAll(async () => {
+    await testSetup.cleanup();
+  });
+
   it('GET /me', async () => {
     const userInfo = testSetup.userService.toFullUserDto(user);
     const response = await agent
diff --git a/test/private-api/media.e2e-spec.ts b/test/private-api/media.e2e-spec.ts
index 85fa9fb79..7d4a09da9 100644
--- a/test/private-api/media.e2e-spec.ts
+++ b/test/private-api/media.e2e-spec.ts
@@ -53,6 +53,13 @@ describe('Media', () => {
       .expect(201);
   });
 
+  afterAll(async () => {
+    // Delete the upload folder
+    await ensureDeleted(uploadPath);
+    await testSetup.app.close();
+    await testSetup.cleanup();
+  });
+
   describe('POST /media', () => {
     it('works', async () => {
       const uploadResponse = await agent
@@ -122,10 +129,4 @@ describe('Media', () => {
     const filename = url.split('/').pop() || '';
     await agent.delete('/api/private/media/' + filename).expect(204);
   });
-
-  afterAll(async () => {
-    // Delete the upload folder
-    await ensureDeleted(uploadPath);
-    await testSetup.app.close();
-  });
 });
diff --git a/test/private-api/notes.e2e-spec.ts b/test/private-api/notes.e2e-spec.ts
index 7e26bcaf4..e77062fbb 100644
--- a/test/private-api/notes.e2e-spec.ts
+++ b/test/private-api/notes.e2e-spec.ts
@@ -54,6 +54,11 @@ describe('Notes', () => {
       .expect(201);
   });
 
+  afterAll(async () => {
+    await testSetup.app.close();
+    await testSetup.cleanup();
+  });
+
   it('POST /notes', async () => {
     const response = await agent
       .post('/api/private/notes')
@@ -352,8 +357,4 @@ describe('Notes', () => {
         .expect(403);
     });
   });
-
-  afterAll(async () => {
-    await testSetup.app.close();
-  });
 });
diff --git a/test/private-api/register-and-login.e2e-spec.ts b/test/private-api/register-and-login.e2e-spec.ts
index 79b3fc1c4..04972d390 100644
--- a/test/private-api/register-and-login.e2e-spec.ts
+++ b/test/private-api/register-and-login.e2e-spec.ts
@@ -23,6 +23,7 @@ describe('Register and Login', () => {
 
   afterEach(async () => {
     await testSetup.app.close();
+    await testSetup.cleanup();
   });
 
   test('a user can successfully create a local account and log in', async () => {
diff --git a/test/private-api/tokens.e2e-spec.ts b/test/private-api/tokens.e2e-spec.ts
index f74b84808..bb8917f08 100644
--- a/test/private-api/tokens.e2e-spec.ts
+++ b/test/private-api/tokens.e2e-spec.ts
@@ -35,6 +35,10 @@ describe('Tokens', () => {
       .expect(201);
   });
 
+  afterAll(async () => {
+    await testSetup.cleanup();
+  });
+
   it(`POST /tokens`, async () => {
     const tokenName = 'testToken';
     const response = await agent
diff --git a/test/private-api/users.e2e-spec.ts b/test/private-api/users.e2e-spec.ts
index c61b7ea86..99f18b663 100644
--- a/test/private-api/users.e2e-spec.ts
+++ b/test/private-api/users.e2e-spec.ts
@@ -17,6 +17,7 @@ describe('Users', () => {
 
   afterEach(async () => {
     await testSetup.app.close();
+    await testSetup.cleanup();
   });
 
   test('details for existing users can be retrieved', async () => {
diff --git a/test/public-api/alias.e2e-spec.ts b/test/public-api/alias.e2e-spec.ts
index 897e7109a..3036117f1 100644
--- a/test/public-api/alias.e2e-spec.ts
+++ b/test/public-api/alias.e2e-spec.ts
@@ -28,6 +28,7 @@ describe('Alias', () => {
 
   afterEach(async () => {
     await testSetup.app.close();
+    await testSetup.cleanup();
   });
 
   describe('POST /alias', () => {
diff --git a/test/public-api/me.e2e-spec.ts b/test/public-api/me.e2e-spec.ts
index 13e5c8147..c0f13c087 100644
--- a/test/public-api/me.e2e-spec.ts
+++ b/test/public-api/me.e2e-spec.ts
@@ -31,6 +31,11 @@ describe('Me', () => {
     await testSetup.app.init();
   });
 
+  afterAll(async () => {
+    await testSetup.app.close();
+    await testSetup.cleanup();
+  });
+
   it(`GET /me`, async () => {
     const userInfo = testSetup.userService.toFullUserDto(user);
     const response = await request(testSetup.app.getHttpServer())
@@ -218,8 +223,4 @@ describe('Me', () => {
     }
     await fs.rm(uploadPath, { recursive: true });
   });
-
-  afterAll(async () => {
-    await testSetup.app.close();
-  });
 });
diff --git a/test/public-api/media.e2e-spec.ts b/test/public-api/media.e2e-spec.ts
index d477c1ece..f68f11c6f 100644
--- a/test/public-api/media.e2e-spec.ts
+++ b/test/public-api/media.e2e-spec.ts
@@ -43,6 +43,13 @@ describe('Media', () => {
     );
   });
 
+  afterAll(async () => {
+    // Delete the upload folder
+    await ensureDeleted(uploadPath);
+    await testSetup.app.close();
+    await testSetup.cleanup();
+  });
+
   describe('POST /media', () => {
     it('works', async () => {
       const uploadResponse = await request(testSetup.app.getHttpServer())
@@ -111,10 +118,4 @@ describe('Media', () => {
       .delete('/api/v2/media/' + filename)
       .expect(204);
   });
-
-  afterAll(async () => {
-    // Delete the upload folder
-    await ensureDeleted(uploadPath);
-    await testSetup.app.close();
-  });
 });
diff --git a/test/public-api/notes.e2e-spec.ts b/test/public-api/notes.e2e-spec.ts
index d5409707d..7c6554d6a 100644
--- a/test/public-api/notes.e2e-spec.ts
+++ b/test/public-api/notes.e2e-spec.ts
@@ -41,6 +41,11 @@ describe('Notes', () => {
     testImage = await fs.readFile('test/public-api/fixtures/test.png');
   });
 
+  afterAll(async () => {
+    await testSetup.app.close();
+    await testSetup.cleanup();
+  });
+
   it('POST /notes', async () => {
     const response = await request(testSetup.app.getHttpServer())
       .post('/api/v2/notes')
@@ -212,6 +217,7 @@ describe('Notes', () => {
       expect(await updatedNote.groupPermissions).toHaveLength(0);
       await request(testSetup.app.getHttpServer())
         .delete('/api/v2/notes/test3')
+        .send({ keepMedia: false })
         .expect(204);
       await expect(
         testSetup.notesService.getNoteByIdOrAlias('test3'),
@@ -463,8 +469,4 @@ describe('Notes', () => {
         .expect(403);
     });
   });
-
-  afterAll(async () => {
-    await testSetup.app.close();
-  });
 });