diff --git a/src/pages/app/__tests__/builder.test.js b/src/pages/app/__tests__/builder.test.js
index f6ad40f8..e22d6e9d 100644
--- a/src/pages/app/__tests__/builder.test.js
+++ b/src/pages/app/__tests__/builder.test.js
@@ -102,8 +102,9 @@ describe('Builder', () => {
 
     if (waitForDatabaseUpdateToHaveCompleted) {
       await fnWaitForDatabaseUpdateToHaveCompleted();
-      mockDatabaseUpdateFunction.mockClear();
     }
+
+    mockDatabaseUpdateFunction.mockClear();
   }
 
   describe('handles errors', () => {
diff --git a/src/pages/app/__tests__/dashboard.test.js b/src/pages/app/__tests__/dashboard.test.js
index c1f21cd6..421b3809 100644
--- a/src/pages/app/__tests__/dashboard.test.js
+++ b/src/pages/app/__tests__/dashboard.test.js
@@ -374,12 +374,11 @@ describe('Dashboard', () => {
   });
 
   describe('when resume is renamed', () => {
-    // const mockDatabaseUpdateFunction = null;
+    let mockDatabaseUpdateFunction = null;
     let resumeToRename = null;
     let resumeToRenameId = null;
     let nameTextBox = null;
 
-    /*
     const waitForDatabaseUpdateToHaveCompleted = async () => {
       await waitFor(() => mockDatabaseUpdateFunction.mock.calls[0][0]);
       await waitFor(() => mockDatabaseUpdateFunction.mock.results[0].value);
@@ -395,7 +394,6 @@ describe('Dashboard', () => {
         ).resolves.toBeUndefined(),
       );
     };
-    */
 
     beforeEach(async () => {
       await setup();
@@ -405,14 +403,13 @@ describe('Dashboard', () => {
       );
       resumeToRenameId = resumeToRename.id;
 
-      /*
       mockDatabaseUpdateFunction = jest.spyOn(
         FirebaseStub.database().ref(
           `${DatabaseConstants.resumesPath}/${resumeToRenameId}`,
         ),
         'update',
       );
-      */
+      mockDatabaseUpdateFunction.mockClear();
 
       const resumeToRenameMenuToggle = await screen.findByTestId(
         `${resumePreviewMenuToggleDataTestIdPrefix}${resumeToRenameId}`,
@@ -432,6 +429,10 @@ describe('Dashboard', () => {
       nameTextBox = screen.getByRole('textbox', { name: /name/i });
     });
 
+    it('renders current name in modal window', async () => {
+      expect(nameTextBox).toHaveValue(resumeToRename.name);
+    });
+
     describe('with name shorter than 5 characters', () => {
       it('displays validation error and notification', async () => {
         fireEvent.change(nameTextBox, { target: { value: 'CV 2' } });
@@ -462,6 +463,81 @@ describe('Dashboard', () => {
         dismissNotification(notification);
       });
     });
+
+    describe('with valid name', () => {
+      let resumeNewName = null;
+      let now = 0;
+
+      beforeEach(() => {
+        resumeNewName = `${resumeToRename.name} - renamed`;
+        now = new Date().getTime();
+
+        fireEvent.change(nameTextBox, {
+          target: { value: resumeNewName },
+        });
+
+        const modalEditResumeButton = screen.getByRole('button', {
+          name: /edit resume/i,
+        });
+        fireEvent.click(modalEditResumeButton);
+      });
+
+      it('renders loading message', async () => {
+        await waitFor(() =>
+          expect(
+            screen.getByRole('button', {
+              name: /loading/i,
+            }),
+          ).toBeInTheDocument(),
+        );
+        await waitForElementToBeRemoved(() =>
+          screen.getByRole('button', {
+            name: /loading/i,
+          }),
+        );
+
+        await waitForModalWindowToHaveBeenClosed();
+        await waitForDatabaseUpdateToHaveCompleted();
+        await waitForResumeToBeRenderedInPreview(resumeNewName);
+      });
+
+      it('closes modal window', async () => {
+        await waitFor(() =>
+          expect(waitForModalWindowToHaveBeenClosed()).resolves.toBeUndefined(),
+        );
+
+        await waitForDatabaseUpdateToHaveCompleted();
+        await waitForResumeToBeRenderedInPreview(resumeNewName);
+      });
+
+      it('renders renamed resume in preview', async () => {
+        await waitForModalWindowToHaveBeenClosed();
+        await waitForDatabaseUpdateToHaveCompleted();
+
+        await waitFor(() =>
+          expect(
+            expectResumeToBeRenderedInPreview(resumeNewName),
+          ).resolves.toBeUndefined(),
+        );
+      });
+
+      it('updates database', async () => {
+        await waitForModalWindowToHaveBeenClosed();
+
+        await expectDatabaseUpdateToHaveCompleted();
+        const mockDatabaseUpdateFunctionCallArgument =
+          mockDatabaseUpdateFunction.mock.calls[0][0];
+        expect(mockDatabaseUpdateFunctionCallArgument.id).toBe(
+          resumeToRenameId,
+        );
+        expect(mockDatabaseUpdateFunctionCallArgument.name).toBe(resumeNewName);
+        expect(
+          mockDatabaseUpdateFunctionCallArgument.updatedAt,
+        ).toBeGreaterThanOrEqual(now);
+
+        await waitForResumeToBeRenderedInPreview(resumeNewName);
+      });
+    });
   });
 
   describe('while loading', () => {