diff --git a/src/components/block-tunes/block-tune-delete.ts b/src/components/block-tunes/block-tune-delete.ts
index f7dc6742..a812e0bf 100644
--- a/src/components/block-tunes/block-tune-delete.ts
+++ b/src/components/block-tunes/block-tune-delete.ts
@@ -91,6 +91,7 @@ export default class DeleteTune implements BlockTune {
       icon: $.svg('cross', 14, 14).outerHTML,
       label: this.api.i18n.t('Delete'),
       onClick: (item, e): void => this.handleClick(e),
+      name: 'delete',
     };
   }
 
diff --git a/src/components/block-tunes/block-tune-move-down.ts b/src/components/block-tunes/block-tune-move-down.ts
index e6c8626d..b720f3ed 100644
--- a/src/components/block-tunes/block-tune-move-down.ts
+++ b/src/components/block-tunes/block-tune-move-down.ts
@@ -79,6 +79,7 @@ export default class MoveDownTune implements BlockTune {
       icon: $.svg('arrow-down', 14, 14).outerHTML,
       label: this.api.i18n.t('Move down'),
       onClick: (item): void => this.handleClick(),
+      name: 'move-down',
     };
   }
 
diff --git a/src/components/block-tunes/block-tune-move-up.ts b/src/components/block-tunes/block-tune-move-up.ts
index d7d1c732..c0c68494 100644
--- a/src/components/block-tunes/block-tune-move-up.ts
+++ b/src/components/block-tunes/block-tune-move-up.ts
@@ -78,6 +78,7 @@ export default class MoveUpTune implements BlockTune {
       icon: $.svg('arrow-up', 14, 14).outerHTML,
       label: this.api.i18n.t('Move up'),
       onClick: (item, e): void => this.handleClick(e),
+      name: 'move-up',
     };
   }
 
diff --git a/src/components/block/index.ts b/src/components/block/index.ts
index 647a361a..b5b1faee 100644
--- a/src/components/block/index.ts
+++ b/src/components/block/index.ts
@@ -665,7 +665,8 @@ export default class Block extends EventsDispatcher<BlockEvents> {
    *
    */
   public getTunesItems(): PopoverItem[] {
-    return Array.from(this.defaultTunesInstances.values()).map(tune => tune.blockSettings)
+    return Array.from(this.defaultTunesInstances.values())
+      .map(tune => tune.blockSettings)
       .filter(item => !!item);
   }
 
diff --git a/test/cypress/tests/onchange.spec.ts b/test/cypress/tests/onchange.spec.ts
index f4740c30..84a23c7d 100644
--- a/test/cypress/tests/onchange.spec.ts
+++ b/test/cypress/tests/onchange.spec.ts
@@ -262,7 +262,7 @@ describe('onChange callback', () => {
       .click();
 
     cy.get('[data-cy=editorjs]')
-      .get('div.ce-settings__button--delete')
+      .get('div[data-item-name=delete]')
       .click()
       .click();
 
@@ -292,7 +292,7 @@ describe('onChange callback', () => {
       .click();
 
     cy.get('[data-cy=editorjs]')
-      .get('div.ce-tune-move-up')
+      .get('div[data-item-name=move-up]')
       .click();
 
     cy.get('@onChange').should('be.calledWithMatch', EditorJSApiMock, Cypress.sinon.match({