diff --git a/src/notes/notes.service.spec.ts b/src/notes/notes.service.spec.ts
index ab852a9e9..2d8350c71 100644
--- a/src/notes/notes.service.spec.ts
+++ b/src/notes/notes.service.spec.ts
@@ -684,7 +684,7 @@ describe('NotesService', () => {
       ];
       revisions[0].createdAt = new Date(1549312452000);
       jest.spyOn(revisionRepo, 'findOne').mockResolvedValue(revisions[0]);
-      note.id = 'testId';
+      note.publicId = 'testId';
       note.alias = 'testAlias';
       note.title = 'testTitle';
       note.description = 'testDescription';
@@ -719,7 +719,7 @@ describe('NotesService', () => {
       ];
       note.viewCount = 1337;
       const metadataDto = await service.toNoteMetadataDto(note);
-      expect(metadataDto.id).toEqual(note.id);
+      expect(metadataDto.id).toEqual(note.publicId);
       expect(metadataDto.alias).toEqual(note.alias);
       expect(metadataDto.title).toEqual(note.title);
       expect(metadataDto.createTime).toEqual(revisions[0].createdAt);
@@ -778,7 +778,7 @@ describe('NotesService', () => {
         .spyOn(revisionRepo, 'findOne')
         .mockResolvedValue(revisions[0])
         .mockResolvedValue(revisions[0]);
-      note.id = 'testId';
+      note.publicId = 'testId';
       note.alias = 'testAlias';
       note.title = 'testTitle';
       note.description = 'testDescription';
@@ -813,7 +813,7 @@ describe('NotesService', () => {
       ];
       note.viewCount = 1337;
       const noteDto = await service.toNoteDto(note);
-      expect(noteDto.metadata.id).toEqual(note.id);
+      expect(noteDto.metadata.id).toEqual(note.publicId);
       expect(noteDto.metadata.alias).toEqual(note.alias);
       expect(noteDto.metadata.title).toEqual(note.title);
       expect(noteDto.metadata.createTime).toEqual(revisions[0].createdAt);
diff --git a/test/private-api/me.e2e-spec.ts b/test/private-api/me.e2e-spec.ts
index 79166f13b..f4943f2e8 100644
--- a/test/private-api/me.e2e-spec.ts
+++ b/test/private-api/me.e2e-spec.ts
@@ -111,10 +111,26 @@ describe('Me', () => {
     expect(responseBefore.body).toHaveLength(0);
 
     const testImage = await fs.readFile('test/public-api/fixtures/test.png');
-    const url0 = await mediaService.saveFile(testImage, 'hardcoded', note1.id);
-    const url1 = await mediaService.saveFile(testImage, 'hardcoded', note1.id);
-    const url2 = await mediaService.saveFile(testImage, 'hardcoded', note2.id);
-    const url3 = await mediaService.saveFile(testImage, 'hardcoded', note2.id);
+    const url0 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note1.publicId,
+    );
+    const url1 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note1.publicId,
+    );
+    const url2 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note2.alias ?? '',
+    );
+    const url3 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note2.alias ?? '',
+    );
 
     const response = await request(httpServer)
       .get('/me/media/')
@@ -147,7 +163,11 @@ describe('Me', () => {
 
   it('DELETE /me', async () => {
     const testImage = await fs.readFile('test/public-api/fixtures/test.png');
-    const url0 = await mediaService.saveFile(testImage, 'hardcoded', note1.id);
+    const url0 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note1.publicId,
+    );
     const dbUser = await userService.getUserByUsername('hardcoded');
     expect(dbUser).toBeInstanceOf(User);
     const mediaUploads = await mediaService.listUploadsByUser(dbUser);
diff --git a/test/private-api/notes.e2e-spec.ts b/test/private-api/notes.e2e-spec.ts
index aca2f5a30..515c23afb 100644
--- a/test/private-api/notes.e2e-spec.ts
+++ b/test/private-api/notes.e2e-spec.ts
@@ -261,25 +261,27 @@ describe('Notes', () => {
 
   describe('GET /notes/{note}/media', () => {
     it('works', async () => {
-      const note = await notesService.createNote(content, 'test6', user);
-      const extraNote = await notesService.createNote(content, 'test7', user);
+      const alias = 'test6';
+      const extraAlias = 'test7';
+      await notesService.createNote(content, alias, user);
+      await notesService.createNote(content, extraAlias, user);
       const httpServer = app.getHttpServer();
       const response = await request(httpServer)
-        .get(`/notes/${note.id}/media/`)
+        .get(`/notes/${alias}/media/`)
         .expect('Content-Type', /json/)
         .expect(200);
       expect(response.body).toHaveLength(0);
 
       const testImage = await fs.readFile('test/private-api/fixtures/test.png');
-      const url0 = await mediaService.saveFile(testImage, 'hardcoded', note.id);
+      const url0 = await mediaService.saveFile(testImage, 'hardcoded', alias);
       const url1 = await mediaService.saveFile(
         testImage,
         'hardcoded',
-        extraNote.id,
+        extraAlias,
       );
 
       const responseAfter = await request(httpServer)
-        .get(`/notes/${note.id}/media/`)
+        .get(`/notes/${alias}/media/`)
         .expect('Content-Type', /json/)
         .expect(200);
       expect(responseAfter.body).toHaveLength(1);
@@ -299,13 +301,10 @@ describe('Notes', () => {
         .expect(404);
     });
     it("fails, when user can't read note", async () => {
-      const note = await notesService.createNote(
-        'This is a test note.',
-        'test11',
-        user2,
-      );
+      const alias = 'test11';
+      await notesService.createNote('This is a test note.', alias, user2);
       await request(app.getHttpServer())
-        .get(`/notes/${note.id}/media/`)
+        .get(`/notes/${alias}/media/`)
         .expect('Content-Type', /json/)
         .expect(401);
     });
diff --git a/test/public-api/me.e2e-spec.ts b/test/public-api/me.e2e-spec.ts
index 3d58d8b60..f23a68190 100644
--- a/test/public-api/me.e2e-spec.ts
+++ b/test/public-api/me.e2e-spec.ts
@@ -243,10 +243,26 @@ describe('Me', () => {
     expect(response1.body).toHaveLength(0);
 
     const testImage = await fs.readFile('test/public-api/fixtures/test.png');
-    const url0 = await mediaService.saveFile(testImage, 'hardcoded', note1.id);
-    const url1 = await mediaService.saveFile(testImage, 'hardcoded', note1.id);
-    const url2 = await mediaService.saveFile(testImage, 'hardcoded', note2.id);
-    const url3 = await mediaService.saveFile(testImage, 'hardcoded', note2.id);
+    const url0 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note1.publicId,
+    );
+    const url1 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note1.publicId,
+    );
+    const url2 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note2.publicId,
+    );
+    const url3 = await mediaService.saveFile(
+      testImage,
+      'hardcoded',
+      note2.publicId,
+    );
 
     const response = await request(httpServer)
       .get('/me/media/')
diff --git a/test/public-api/notes.e2e-spec.ts b/test/public-api/notes.e2e-spec.ts
index 024c3d0de..6a12bd731 100644
--- a/test/public-api/notes.e2e-spec.ts
+++ b/test/public-api/notes.e2e-spec.ts
@@ -204,7 +204,9 @@ describe('Notes', () => {
       ];
       updateNotePermission.sharedToGroups = [];
       await notesService.updateNotePermissions(note, updateNotePermission);
-      const updatedNote = await notesService.getNoteByIdOrAlias(note.alias);
+      const updatedNote = await notesService.getNoteByIdOrAlias(
+        note.alias ?? '',
+      );
       expect(updatedNote.userPermissions).toHaveLength(1);
       expect(updatedNote.userPermissions[0].canEdit).toEqual(
         updateNotePermission.sharedToUsers[0].canEdit,
@@ -391,25 +393,27 @@ describe('Notes', () => {
 
   describe('GET /notes/{note}/media', () => {
     it('works', async () => {
-      const note = await notesService.createNote(content, 'test9', user);
-      const extraNote = await notesService.createNote(content, 'test10', user);
+      const alias = 'test9';
+      const extraAlias = 'test10';
+      await notesService.createNote(content, alias, user);
+      await notesService.createNote(content, extraAlias, user);
       const httpServer = app.getHttpServer();
       const response = await request(httpServer)
-        .get(`/notes/${note.id}/media/`)
+        .get(`/notes/${alias}/media/`)
         .expect('Content-Type', /json/)
         .expect(200);
       expect(response.body).toHaveLength(0);
 
       const testImage = await fs.readFile('test/public-api/fixtures/test.png');
-      const url0 = await mediaService.saveFile(testImage, 'hardcoded', note.id);
+      const url0 = await mediaService.saveFile(testImage, 'hardcoded', alias);
       const url1 = await mediaService.saveFile(
         testImage,
         'hardcoded',
-        extraNote.id,
+        extraAlias,
       );
 
       const responseAfter = await request(httpServer)
-        .get(`/notes/${note.id}/media/`)
+        .get(`/notes/${alias}/media/`)
         .expect('Content-Type', /json/)
         .expect(200);
       expect(responseAfter.body).toHaveLength(1);
@@ -429,13 +433,10 @@ describe('Notes', () => {
         .expect(404);
     });
     it("fails, when user can't read note", async () => {
-      const note = await notesService.createNote(
-        'This is a test note.',
-        'test11',
-        user2,
-      );
+      const alias = 'test11';
+      await notesService.createNote('This is a test note.', alias, user2);
       await request(app.getHttpServer())
-        .get(`/notes/${note.id}/media/`)
+        .get(`/notes/${alias}/media/`)
         .expect('Content-Type', /json/)
         .expect(401);
     });