diff --git a/packages/core/src/app/order/OrderConfirmation.test.tsx b/packages/core/src/app/order/OrderConfirmation.test.tsx
index a8d03263fb..d9371ce268 100644
--- a/packages/core/src/app/order/OrderConfirmation.test.tsx
+++ b/packages/core/src/app/order/OrderConfirmation.test.tsx
@@ -23,6 +23,19 @@ import { CreatedCustomer } from '../guestSignup';
 import OrderConfirmation, { OrderConfirmationProps } from './OrderConfirmation';
 import { getGatewayOrderPayment, getOrder } from './orders.mock';
 
+const passwordRegex = /^(?=.*[a-zA-Z])(?=.*[0-9]).*$/;
+
+// Function to make sure faker generates valid password as per regex
+const generateValidPassword = () => {
+    let password = '';
+
+    do {
+        password = faker.internet.password();
+    } while (!passwordRegex.test(password));
+
+    return password;
+}
+
 describe('OrderConfirmation', () => {
     let checkoutService: CheckoutService;
     let checkoutState: CheckoutSelectors;
@@ -131,7 +144,7 @@ describe('OrderConfirmation', () => {
     });
 
     it('renders create account form, fills in the form and submit data', async () => {
-        const password = faker.internet.password();
+        const password = generateValidPassword();
 
         render(<ComponentTest {...defaultProps} />);
 
@@ -151,7 +164,7 @@ describe('OrderConfirmation', () => {
     });
 
     it('renders set password form, fills in the form and submit data', async () => {
-        const password = faker.internet.password();
+        const password = generateValidPassword();
 
         jest.spyOn(checkoutState.data, 'getOrder').mockReturnValue({
             ...getOrder(),
diff --git a/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.test.tsx b/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.test.tsx
index 8bc7b868c4..726b41d8b5 100644
--- a/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.test.tsx
+++ b/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.test.tsx
@@ -126,11 +126,9 @@ describe('ManageInstrumentsModal', () => {
         expect(await screen.findByText(localeContext.language.translate('payment.instrument_manage_modal_confirmation_label'))).toBeInTheDocument();
     });
 
-    it.skip('shows list of instruments if user decides to cancel their action', async () => {
+    it('shows list of instruments if user decides to cancel their action', async () => {
         render(<ManageInstrumentsModalTest {...defaultProps} />);
 
-        await userEvent.click(screen.getAllByText('Delete')[0]);
-        await userEvent.click(screen.getByText('Cancel'));
         await userEvent.click(screen.getAllByText('Delete')[0]);
         await userEvent.click(screen.getByText('Cancel'));
 
diff --git a/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.tsx b/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.tsx
index af10eb87fc..eff4ae7ad7 100644
--- a/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.tsx
+++ b/packages/core/src/app/payment/storedInstrument/ManageInstrumentsModal.tsx
@@ -152,7 +152,7 @@ class ManageInstrumentsModal extends Component<
 
         this.setState(
             {
-                isConfirmingDelete: false,
+                isConfirmingDelete: this.state.isConfirmingDelete,
             },
             onAfterOpen,
         );
diff --git a/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.test.tsx b/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.test.tsx
index a075050cb9..a774485984 100644
--- a/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.test.tsx
+++ b/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.test.tsx
@@ -120,8 +120,7 @@ describe('ManageInstrumentsModal', () => {
         ).toBeInTheDocument();
     });
 
-    // Skip the test as it is flaky
-    it.skip('deletes selected instrument and closes modal if user confirms their action', async () => {
+    it('deletes selected instrument and closes modal if user confirms their action', async () => {
         jest.spyOn(checkoutService, 'deleteInstrument').mockResolvedValue(checkoutState);
 
         render(<ManageInstrumentsModalTest {...defaultProps} />);
diff --git a/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.tsx b/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.tsx
index 1572bc8442..09184159ba 100644
--- a/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.tsx
+++ b/packages/instrument-utils/src/storedInstrument/ManageInstrumentsModal/ManageInstrumentsModal.tsx
@@ -186,10 +186,11 @@ class ManageInstrumentsModal extends Component<
 
     private handleAfterOpen: () => void = () => {
         const { onAfterOpen } = this.props;
+        const { isConfirmingDelete } = this.state;
 
         this.setState(
             {
-                isConfirmingDelete: false,
+                isConfirmingDelete,
             },
             onAfterOpen,
         );