diff --git a/src/components/Feedback/FeedbackModal.spec.tsx b/src/components/Feedback/FeedbackModal.spec.tsx
index 4f56e7c4e43c63f3661242739fadc4639a465528..3bbc892cb93250ba5d3110f76263d053c4d19e3a 100644
--- a/src/components/Feedback/FeedbackModal.spec.tsx
+++ b/src/components/Feedback/FeedbackModal.spec.tsx
@@ -1,3 +1,5 @@
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import FeedbackModal from 'components/Feedback/FeedbackModal'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
@@ -35,34 +37,33 @@ describe('FeedbackModal component', () => {
 
   describe('FeedbackModal functionalities', () => {
     it('should close modal with the "x" button', async () => {
-      const wrapper = mount(
+      render(
         <Provider store={store}>
           <FeedbackModal />
         </Provider>
       )
-
-      wrapper.find('.modal-paper-close-button').first().simulate('click')
+      await userEvent.click(screen.getAllByRole('button')[0])
       expect(mockAppDispatch).toHaveBeenCalledTimes(1)
     })
 
     it('should close modal with the "later" button', async () => {
-      const wrapper = mount(
+      render(
         <Provider store={store}>
           <FeedbackModal />
         </Provider>
       )
-      wrapper.find('.btnSecondary').first().simulate('click')
+      await userEvent.click(screen.getAllByRole('button')[1])
       expect(mockAppDispatch).toHaveBeenCalledTimes(1)
     })
 
-    it('should open the SAU link', () => {
+    it('should open the SAU link', async () => {
       global.open = jest.fn()
-      const wrapper = mount(
+      render(
         <Provider store={store}>
           <FeedbackModal />
         </Provider>
       )
-      wrapper.find('.btnPrimary').first().simulate('click')
+      await userEvent.click(screen.getAllByRole('button')[2])
       expect(window.open).toHaveBeenCalledTimes(1)
       expect(global.open).toHaveBeenCalledWith(`${__SAU_LINK__}?version=0.0.0`)
     })