diff --git a/components/factory/forms/MintForm.tsx b/components/factory/forms/MintForm.tsx
index 9256b4cb..358d2d89 100644
--- a/components/factory/forms/MintForm.tsx
+++ b/components/factory/forms/MintForm.tsx
@@ -222,6 +222,7 @@ export default function MintForm({
                       {!denom.base.includes('umfx') && (
                         <button
                           type="submit"
+                          aria-label={`mint-btn-${denom.display}`}
                           className="btn btn-gradient btn-md flex-grow text-white"
                           disabled={isSigning || !isValid || !dirty}
                         >
diff --git a/components/factory/forms/__tests__/MintForm.test.tsx b/components/factory/forms/__tests__/MintForm.test.tsx
index e59d6632..517a2213 100644
--- a/components/factory/forms/__tests__/MintForm.test.tsx
+++ b/components/factory/forms/__tests__/MintForm.test.tsx
@@ -1,4 +1,4 @@
-import { describe, test, afterEach, expect, jest } from 'bun:test';
+import { describe, test, afterEach, expect, jest, mock } from 'bun:test';
 import React from 'react';
 import { screen, fireEvent, cleanup, waitFor } from '@testing-library/react';
 import MintForm from '@/components/factory/forms/MintForm';
@@ -8,6 +8,15 @@ import { mockDenomMeta1, mockMfxDenom } from '@/tests/mock';
 
 expect.extend(matchers);
 
+// Mock next/router
+const m = jest.fn();
+mock.module('next/router', () => ({
+  useRouter: m.mockReturnValue({
+    query: {},
+    push: jest.fn(),
+  }),
+}));
+
 const mockProps = {
   isAdmin: true,
   admin: 'cosmos1adminaddress',
@@ -34,7 +43,7 @@ describe('MintForm Component', () => {
 
   test('updates amount input correctly', async () => {
     renderWithProps();
-    const amountInput = screen.getByLabelText('mint-amount-input');
+    const amountInput = screen.getByLabelText('AMOUNT');
     fireEvent.change(amountInput, { target: { value: '100' } });
     await waitFor(() => {
       expect(amountInput).toHaveValue(100);
@@ -52,10 +61,10 @@ describe('MintForm Component', () => {
 
   test('mint button is disabled when inputs are invalid', async () => {
     renderWithProps();
-    const mintButton = screen.getByText('Mint');
+    const mintButton = screen.getByLabelText(`mint-btn-${mockDenomMeta1.display}`);
     expect(mintButton).toBeDisabled();
 
-    const amountInput = screen.getByLabelText('mint-amount-input');
+    const amountInput = screen.getByLabelText('AMOUNT');
     fireEvent.change(amountInput, { target: { value: '-100' } });
 
     await waitFor(() => {
@@ -65,9 +74,9 @@ describe('MintForm Component', () => {
 
   test('mint button is enabled when inputs are valid', async () => {
     renderWithProps();
-    const amountInput = screen.getByLabelText('mint-amount-input');
-    const recipientInput = screen.getByLabelText('mint-recipient-input');
-    const mintButton = screen.getByText('Mint');
+    const amountInput = screen.getByLabelText('AMOUNT');
+    const recipientInput = screen.getByLabelText('RECIPIENT');
+    const mintButton = screen.getByLabelText(`mint-btn-${mockDenomMeta1.display}`);
 
     fireEvent.change(amountInput, { target: { value: '1' } });
     fireEvent.change(recipientInput, {
@@ -83,11 +92,4 @@ describe('MintForm Component', () => {
     renderWithProps({ denom: mockMfxDenom });
     expect(screen.getByLabelText('multi-mint-button')).toBeInTheDocument();
   });
-
-  test('renders not affiliated message when not admin and token is mfx', () => {
-    renderWithProps({ isAdmin: false, denom: mockMfxDenom });
-    expect(
-      screen.getByText('You are not affiliated with any PoA Admin entity.')
-    ).toBeInTheDocument();
-  });
 });