diff --git a/packages/design-system/src/components/Accordion/Accordion.cy.tsx b/packages/design-system/src/components/Accordion/Accordion.cy.tsx
index ccd218969b2..d312babe50b 100644
--- a/packages/design-system/src/components/Accordion/Accordion.cy.tsx
+++ b/packages/design-system/src/components/Accordion/Accordion.cy.tsx
@@ -72,12 +72,12 @@ context('<CollapsiblePanel />', () => {
 			</div>,
 		);
 		cy.get('#CollapsiblePanel__control--disabled-panel').should('not.exist');
-		cy.findByTestId('action.button').should('not.exist');
+		cy.findByTestId('action.button.0').should('not.exist');
 	});
 
 	it('should display action toolip', () => {
 		cy.mount(<WithActions />);
-		cy.findByTestId('action.button')
+		cy.findByTestId('action.button.0')
 			.focus()
 			.should('have.attr', 'aria-describedby')
 			.then(describedBy => cy.get(`#${describedBy}`).should('have.text', 'action tooltip'));
diff --git a/packages/forms/src/UIForm/fieldsets/CollapsibleFieldset/CollapsibleFieldset.component.js b/packages/forms/src/UIForm/fieldsets/CollapsibleFieldset/CollapsibleFieldset.component.js
index 94166a45991..23d3eeaf66e 100644
--- a/packages/forms/src/UIForm/fieldsets/CollapsibleFieldset/CollapsibleFieldset.component.js
+++ b/packages/forms/src/UIForm/fieldsets/CollapsibleFieldset/CollapsibleFieldset.component.js
@@ -117,7 +117,7 @@ export default function createCollapsibleFieldset(title = defaultTitle) {
 					index={index}
 					managed={!!managed}
 					expanded={!value.isClosed}
-					action={getAction()}
+					actions={[getAction()]}
 				>
 					{schema.description ? (
 						<InlineMessageInformation