diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js
index 375aec386d..047b7e188d 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import { act, render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ThemeProvider, lightTheme } from '@strapi/design-system';
 import { IntlProvider } from 'react-intl';
@@ -91,7 +91,9 @@ describe('BulkActionsBar', () => {
 
     await act(async () => {
       await user.click(screen.getByRole('button', { name: /\bpublish\b/i }));
-      await user.click(screen.getByTestId('confirm-publish'));
+      await user.click(
+        within(screen.getByRole('dialog')).getByRole('button', { name: /\bpublish\b/i })
+      );
     });
 
     expect(onConfirmPublishAll).toHaveBeenCalledWith([]);
@@ -103,7 +105,9 @@ describe('BulkActionsBar', () => {
 
     await act(async () => {
       await user.click(screen.getByRole('button', { name: /\bunpublish\b/i }));
-      await user.click(screen.getByTestId('confirm-unpublish'));
+      await user.click(
+        within(screen.getByRole('dialog')).getByRole('button', { name: /\bunpublish\b/i })
+      );
     });
 
     expect(onConfirmUnpublishAll).toHaveBeenCalledWith([]);
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogPublishAll/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogPublishAll/index.js
index 4ddc9d33ae..83667eea84 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogPublishAll/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogPublishAll/index.js
@@ -31,7 +31,6 @@ const ConfirmDialogPublishAll = ({ isOpen, onToggleDialog, isConfirmButtonLoadin
           onClick={onConfirm}
           variant="secondary"
           startIcon={<Check />}
-          data-testid="confirm-publish"
           loading={isConfirmButtonLoading}
         >
           {formatMessage({
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogUnpublishAll/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogUnpublishAll/index.js
index 865246cf67..4357a56c81 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogUnpublishAll/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogUnpublishAll/index.js
@@ -38,7 +38,6 @@ const ConfirmDialogUnpublishAll = ({
           onClick={onConfirm}
           variant="secondary"
           startIcon={<Check />}
-          data-testid="confirm-unpublish"
           loading={isConfirmButtonLoading}
         >
           {formatMessage({