diff --git a/packages/app/e2e/browser/agent-message-submission.spec.ts b/packages/app/e2e/browser/agent-message-submission.spec.ts
index 8828e35b9d..3052b1dbca 100644
--- a/packages/app/e2e/browser/agent-message-submission.spec.ts
+++ b/packages/app/e2e/browser/agent-message-submission.spec.ts
@@ -305,7 +305,7 @@ async function retryRestoredSubmission(page: Page, prompt: string): Promise<void
 async function expectRejectedPromptBeforeError(page: Page, prompt: string, errorMessage: string) {
   const messages = page
     .getByTestId("user-message")
-    .or(page.getByText(errorMessage, { exact: true }));
+    .or(page.getByTestId("timeline-notification").filter({ hasText: errorMessage }));
   await expect(messages).toHaveCount(2);
   await expect(messages.nth(0)).toContainText(prompt);
   await expect(messages.nth(1)).toHaveText(errorMessage);
diff --git a/packages/app/e2e/support/helpers/creation.ts b/packages/app/e2e/support/helpers/creation.ts
index e701c00928..ed1ea617ec 100644
--- a/packages/app/e2e/support/helpers/creation.ts
+++ b/packages/app/e2e/support/helpers/creation.ts
@@ -186,7 +186,8 @@ export async function createCreationScenario(page: Page) {
       await requests.settled();
       await expect(
         page
-          .getByText("Requested mock prompt rejection", { exact: true })
+          .getByTestId("timeline-notification")
+          .filter({ hasText: "Requested mock prompt rejection" })
           .filter({ visible: true }),
       ).toBeVisible();
       await expect(
@@ -203,7 +204,11 @@ export async function createCreationScenario(page: Page) {
     async expectPromptBeforeError(prompt: string) {
       const messages = page
         .getByTestId("user-message")
-        .or(page.getByText("Requested mock prompt rejection", { exact: true }))
+        .or(
+          page
+            .getByTestId("timeline-notification")
+            .filter({ hasText: "Requested mock prompt rejection" }),
+        )
         .filter({ visible: true });
       await expect(messages).toHaveCount(2);
       await expect(messages.nth(0)).toContainText(prompt);
diff --git a/packages/app/src/components/message.tsx b/packages/app/src/components/message.tsx
index 4587556ebe..80b23b6b2f 100644
--- a/packages/app/src/components/message.tsx
+++ b/packages/app/src/components/message.tsx
@@ -2161,7 +2161,7 @@ export const Notification = memo(function Notification({
     [resolvedDisableOuterSpacing, config.bg],
   );
   return (
-    <View style={containerStyle}>
+    <View style={containerStyle} testID="timeline-notification">
       <View style={notificationStylesheet.content}>
         <View style={notificationStylesheet.row}>
           <View style={notificationStylesheet.iconContainer}>