diff --git a/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js b/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js
index cc12eaeb310..3fc60550087 100644
--- a/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js
+++ b/tests/cypress/integration/actions_objects2/case_10_polygon_shape_track_label_points.js
@@ -6,7 +6,7 @@
 
 import { taskName, labelName } from '../../support/const';
 
-context('Actions on polygon', () => {
+context('Actions on polygon.', () => {
     const caseId = '10';
     const newLabelName = `New label for case ${caseId}`;
     const createPolygonShape = {
@@ -18,8 +18,6 @@ context('Actions on polygon', () => {
             { x: 250, y: 200 },
             { x: 250, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
     };
     const createPolygonTrack = {
         reDraw: false,
@@ -30,8 +28,6 @@ context('Actions on polygon', () => {
             { x: 350, y: 200 },
             { x: 350, y: 350 },
         ],
-        complete: true,
-        numberOfPoints: null,
     };
     const createPolygonShapePoints = {
         reDraw: false,
@@ -68,8 +64,7 @@ context('Actions on polygon', () => {
             { x: 650, y: 200 },
             { x: 650, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
+        finishWithButton: true,
     };
     const createPolygonTrackSwitchLabel = {
         reDraw: false,
@@ -80,8 +75,7 @@ context('Actions on polygon', () => {
             { x: 750, y: 200 },
             { x: 750, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
+        finishWithButton: true,
     };
 
     before(() => {
@@ -101,7 +95,7 @@ context('Actions on polygon', () => {
             cy.createPolygon(createPolygonTrackPoints);
         });
 
-        it('Draw a polygon shape, track with second label.', () => {
+        it('Draw a polygon shape, track with second label and "Done" button.', () => {
             cy.createPolygon(createPolygonShapeSwitchLabel);
             cy.createPolygon(createPolygonTrackSwitchLabel);
         });
diff --git a/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js b/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js
index 008edb6c898..49dfe7f27c0 100644
--- a/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js
+++ b/tests/cypress/integration/actions_objects2/case_11_polylines_shape_track_label_points.js
@@ -6,7 +6,7 @@
 
 import { taskName, labelName } from '../../support/const';
 
-context('Actions on polylines', () => {
+context('Actions on polylines.', () => {
     const caseId = '11';
     const newLabelName = `New label for case ${caseId}`;
     const createPolylinesShape = {
@@ -17,8 +17,6 @@ context('Actions on polylines', () => {
             { x: 250, y: 200 },
             { x: 250, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
     };
     const createPolylinesTrack = {
         type: 'Track',
@@ -28,8 +26,6 @@ context('Actions on polylines', () => {
             { x: 350, y: 200 },
             { x: 350, y: 350 },
         ],
-        complete: true,
-        numberOfPoints: null,
     };
     const createPolylinesShapePoints = {
         type: 'Shape',
@@ -63,8 +59,7 @@ context('Actions on polylines', () => {
             { x: 650, y: 200 },
             { x: 650, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
+        finishWithButton: true,
     };
     const createPolylinesTrackSwitchLabel = {
         type: 'Track',
@@ -74,8 +69,7 @@ context('Actions on polylines', () => {
             { x: 750, y: 200 },
             { x: 750, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
+        finishWithButton: true,
     };
 
     before(() => {
@@ -95,7 +89,7 @@ context('Actions on polylines', () => {
             cy.createPolyline(createPolylinesTrackPoints);
         });
 
-        it('Draw a polylines shape, track with second label.', () => {
+        it('Draw a polylines shape, track with second label and "Done" button.', () => {
             cy.createPolyline(createPolylinesShapeSwitchLabel);
             cy.createPolyline(createPolylinesTrackSwitchLabel);
         });
diff --git a/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js b/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js
index 48fb6d6d502..002a5fc0559 100644
--- a/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js
+++ b/tests/cypress/integration/actions_objects2/case_12_points_shape_track_label.js
@@ -6,7 +6,7 @@
 
 import { taskName, labelName } from '../../support/const';
 
-context('Actions on points', () => {
+context('Actions on points.', () => {
     const caseId = '12';
     const newLabelName = `New label for case ${caseId}`;
     const createPointsShape = {
@@ -17,8 +17,6 @@ context('Actions on points', () => {
             { x: 250, y: 200 },
             { x: 250, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
     };
     const createPointsTrack = {
         type: 'Track',
@@ -28,8 +26,6 @@ context('Actions on points', () => {
             { x: 350, y: 200 },
             { x: 350, y: 350 },
         ],
-        complete: true,
-        numberOfPoints: null,
     };
     const createPointsShapePoints = {
         type: 'Shape',
@@ -63,8 +59,7 @@ context('Actions on points', () => {
             { x: 650, y: 200 },
             { x: 650, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
+        finishWithButton: true,
     };
     const createPointsTrackSwitchLabel = {
         type: 'Track',
@@ -74,8 +69,7 @@ context('Actions on points', () => {
             { x: 750, y: 200 },
             { x: 750, y: 250 },
         ],
-        complete: true,
-        numberOfPoints: null,
+        finishWithButton: true,
     };
 
     before(() => {
@@ -85,15 +79,17 @@ context('Actions on points', () => {
     });
 
     describe(`Testing case "${caseId}"`, () => {
-        it('Draw a points shape, track', () => {
+        it('Draw a points shape, track.', () => {
             cy.createPoint(createPointsShape);
             cy.createPoint(createPointsTrack);
         });
-        it('Draw a points shape, track with use parameter "number of points"', () => {
+
+        it('Draw a points shape, track with use parameter "number of points".', () => {
             cy.createPoint(createPointsShapePoints);
             cy.createPoint(createPointsTrackPoints);
         });
-        it('Draw a points shape, track with second label', () => {
+
+        it('Draw a points shape, track with second label and "Done" button.', () => {
             cy.createPoint(createPointsShapeSwitchLabel);
             cy.createPoint(createPointsTrackSwitchLabel);
         });
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 474f2358670..66569d26cc1 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -304,7 +304,6 @@ Cypress.Commands.add('createPoint', (createPointParams) => {
             selectedValueGlobal = $labelValue.text();
         });
         if (createPointParams.numberOfPoints) {
-            createPointParams.complete = false;
             cy.get('.ant-input-number-input').clear().type(createPointParams.numberOfPoints);
         }
         cy.contains('button', createPointParams.type).click();
@@ -312,11 +311,15 @@ Cypress.Commands.add('createPoint', (createPointParams) => {
     createPointParams.pointsMap.forEach((element) => {
         cy.get('.cvat-canvas-container').click(element.x, element.y);
     });
-    if (createPointParams.complete) {
-        const keyCodeN = 78;
-        cy.get('.cvat-canvas-container')
-            .trigger('keydown', { keyCode: keyCodeN })
-            .trigger('keyup', { keyCode: keyCodeN });
+    if (createPointParams.finishWithButton) {
+        cy.contains('span', 'Done').click();
+    } else {
+        if (! createPointParams.numberOfPoints) {
+            const keyCodeN = 78;
+            cy.get('.cvat-canvas-container')
+                .trigger('keydown', { keyCode: keyCodeN })
+                .trigger('keyup', { keyCode: keyCodeN });
+        }
     }
     cy.checkObjectParameters(createPointParams, 'POINTS');
 });
@@ -348,7 +351,6 @@ Cypress.Commands.add('createPolygon', (createPolygonParams) => {
                 selectedValueGlobal = $labelValue.text();
             });
             if (createPolygonParams.numberOfPoints) {
-                createPolygonParams.complete = false;
                 cy.get('.ant-input-number-input').clear().type(createPolygonParams.numberOfPoints);
             }
             cy.contains('button', createPolygonParams.type).click();
@@ -357,11 +359,15 @@ Cypress.Commands.add('createPolygon', (createPolygonParams) => {
     createPolygonParams.pointsMap.forEach((element) => {
         cy.get('.cvat-canvas-container').click(element.x, element.y);
     });
-    if (createPolygonParams.complete) {
-        const keyCodeN = 78;
-        cy.get('.cvat-canvas-container')
-            .trigger('keydown', { keyCode: keyCodeN })
-            .trigger('keyup', { keyCode: keyCodeN });
+    if (createPolygonParams.finishWithButton) {
+        cy.contains('span', 'Done').click();
+    } else {
+        if (! createPolygonParams.numberOfPoints) {
+            const keyCodeN = 78;
+            cy.get('.cvat-canvas-container')
+                .trigger('keydown', { keyCode: keyCodeN })
+                .trigger('keyup', { keyCode: keyCodeN });
+        }
     }
     cy.checkObjectParameters(createPolygonParams, 'POLYGON');
 });
@@ -490,7 +496,6 @@ Cypress.Commands.add('createPolyline', (createPolylineParams) => {
             selectedValueGlobal = $labelValue.text();
         });
         if (createPolylineParams.numberOfPoints) {
-            createPolylineParams.complete = false;
             cy.get('.ant-input-number-input').clear().type(createPolylineParams.numberOfPoints);
         }
         cy.contains('button', createPolylineParams.type).click();
@@ -498,11 +503,15 @@ Cypress.Commands.add('createPolyline', (createPolylineParams) => {
     createPolylineParams.pointsMap.forEach((element) => {
         cy.get('.cvat-canvas-container').click(element.x, element.y);
     });
-    if (createPolylineParams.complete) {
-        const keyCodeN = 78;
-        cy.get('.cvat-canvas-container')
-            .trigger('keydown', { keyCode: keyCodeN })
-            .trigger('keyup', { keyCode: keyCodeN });
+    if (createPolylineParams.finishWithButton) {
+        cy.contains('span', 'Done').click();
+    } else {
+        if (! createPolylineParams.numberOfPoints) {
+            const keyCodeN = 78;
+            cy.get('.cvat-canvas-container')
+                .trigger('keydown', { keyCode: keyCodeN })
+                .trigger('keyup', { keyCode: keyCodeN });
+        }
     }
     cy.checkObjectParameters(createPolylineParams, 'POLYLINE');
 });