diff --git a/src/frontend/tests/pages/pui_company.spec.ts b/src/frontend/tests/pages/pui_company.spec.ts
index 96e0631621..5a55895a43 100644
--- a/src/frontend/tests/pages/pui_company.spec.ts
+++ b/src/frontend/tests/pages/pui_company.spec.ts
@@ -81,14 +81,12 @@ test('Company - Supplier Parts', async ({ browser }) => {
 
   await loadTab(page, 'Supplier Parts');
   await clearTableFilters(page);
-
-  await page.getByText(/1 \- 25 \/ 77\d/).waitFor();
+  await page.getByText(/1 \- 25 \/ 7\d\d/).waitFor();
 
   await setTableChoiceFilter(page, 'Primary', 'Yes');
-  await page.getByText(/1 \- 25 \/ 31\d/).waitFor();
+  await page.getByText(/1 \- 25 \/ 3\d\d/).waitFor();
 
   await clearTableFilters(page);
-
   await setTableChoiceFilter(page, 'Primary', 'No');
-  await page.getByText(/1 \- 25 \/ 45\d/).waitFor();
+  await page.getByText(/1 \- 25 \/ 4\d\d/).waitFor();
 });
diff --git a/src/frontend/tests/pages/pui_part.spec.ts b/src/frontend/tests/pages/pui_part.spec.ts
index f4c035c9e1..8508c00060 100644
--- a/src/frontend/tests/pages/pui_part.spec.ts
+++ b/src/frontend/tests/pages/pui_part.spec.ts
@@ -503,6 +503,7 @@ test('Parts - Details - Upload image modal accepts pasted clipboard image', asyn
   await page
     .getByRole('tabpanel', { name: 'Part Details' })
     .locator('img')
+    .first()
     .hover();
 
   const uploadButton = page
@@ -550,10 +551,13 @@ test('Parts - Details - Upload image modal accepts pasted clipboard image', asyn
   await page.getByRole('button', { name: 'Submit' }).click();
   await page.getByText('Image uploaded').waitFor();
 
+  await page.reload();
+
   // Now remove the associated image
   await page
     .getByRole('tabpanel', { name: 'Part Details' })
     .locator('img')
+    .first()
     .hover();
   await page
     .getByRole('button', { name: 'action-button-delete-image' })
diff --git a/src/frontend/tests/pui_login.spec.ts b/src/frontend/tests/pui_login.spec.ts
index 7da891d380..ef7d7b2f08 100644
--- a/src/frontend/tests/pui_login.spec.ts
+++ b/src/frontend/tests/pui_login.spec.ts
@@ -98,6 +98,7 @@ test('Login - Change Password', async ({ page }) => {
   // Navigate to the 'change password' page
   await navigate(page, 'settings/user/account', { waitUntil: 'networkidle' });
 
+  await page.waitForTimeout(1000);
   await openDetailAction(page, 'account', 'change-password');
 
   // First attempt with some errors