diff --git a/test-playwright/20-create-project.spec.ts b/test-playwright/20-create-project.spec.ts
index b1b6ec44..3824f84d 100644
--- a/test-playwright/20-create-project.spec.ts
+++ b/test-playwright/20-create-project.spec.ts
@@ -107,8 +107,11 @@ test('Create new project, then search for it', async ({ page }) => {
 
   // Create new project
   await page.goto('./projects');
-  // close onboarding, but not with a click to go to the main screen
-  await page.locator('div > svg.fa-xmark').click();
+  // close onboarding using established pattern
+  await page.getByTestId('closeOnboardingAndFinish').click();
+  await page.waitForFunction(() => {
+    return !document.querySelector('.dialog-overlay');
+  }, { timeout: 5000 });
   await page.locator('button > svg.fa-plus').click();
   await page.getByPlaceholder('Idea Name').fill(finalTitle);
   await page.getByPlaceholder('Description').fill(finalDescription);
diff --git a/test-playwright/25-create-project-x10.spec.ts b/test-playwright/25-create-project-x10.spec.ts
index 36d06dce..91f16bd6 100644
--- a/test-playwright/25-create-project-x10.spec.ts
+++ b/test-playwright/25-create-project-x10.spec.ts
@@ -126,8 +126,11 @@ test('Create 10 new projects', async ({ page }) => {
   for (let i = 0; i < projectCount; i++) {
     await page.goto('./projects');
     if (i === 0) {
-      // close onboarding, but not with a click to go to the main screen
-      await page.locator('div > svg.fa-xmark').click();
+      // close onboarding using established pattern
+      await page.getByTestId('closeOnboardingAndFinish').click();
+      await page.waitForFunction(() => {
+        return !document.querySelector('.dialog-overlay');
+      }, { timeout: 5000 });
     }
     await page.locator('button > svg.fa-plus').click();
     await page.getByPlaceholder('Idea Name').fill(finalTitles[i]); // Add random suffix
diff --git a/test-playwright/50-record-offer.spec.ts b/test-playwright/50-record-offer.spec.ts
index d4600aab..895f947e 100644
--- a/test-playwright/50-record-offer.spec.ts
+++ b/test-playwright/50-record-offer.spec.ts
@@ -26,8 +26,7 @@ test('Record an offer', async ({ page }) => {
   await page.getByTestId('inputOfferAmount').locator('input').fill(randomNonZeroNumber.toString());
   expect(page.getByRole('button', { name: 'Sign & Send' }));
   await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That offer was recorded.')).toBeVisible();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
+  await page.getByRole('alert').filter({ hasText: 'Success' }).getByRole('button').click(); // dismiss info alert
   // go to the offer and check the values
   await page.goto('./projects');
   await page.getByRole('link', { name: 'Offers', exact: true }).click();
@@ -58,8 +57,7 @@ test('Record an offer', async ({ page }) => {
   await itemDesc.fill(updatedDescription);
   await amount.fill(String(randomNonZeroNumber + 1));
   await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That offer was recorded.')).toBeVisible();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
+  await page.getByRole('alert').filter({ hasText: 'Success' }).getByRole('button').click(); // dismiss info alert
   // go to the offer claim again and check the updated values
   await page.goto('./projects');
   await page.getByRole('link', { name: 'Offers', exact: true }).click();