diff --git a/src/tests/functional/stream_tests.ts b/src/tests/functional/stream_tests.ts
index a8b6a644f..3d159b2e3 100644
--- a/src/tests/functional/stream_tests.ts
+++ b/src/tests/functional/stream_tests.ts
@@ -1,6 +1,6 @@
 import { test } from "@playwright/test"
 import { assert } from "chai"
-import { nextBeat, nextEventNamed, readEventLogs } from "../helpers/page"
+import { nextBeat, nextEventNamed, readEventLogs, waitUntilNoSelector, waitUntilText } from "../helpers/page"
 
 test.beforeEach(async ({ page }) => {
   await page.goto("/src/tests/fixtures/stream.html")
@@ -50,12 +50,10 @@ test("test receiving a message without a template", async ({ page }) => {
     `)
   )
 
-  assert.equal(await page.locator("#messages").count(), 0, "removes target element")
+  assert.notOk(await waitUntilNoSelector(page, "#messages"), "removes target element")
 })
 
 test("test receiving a message with a <script> element", async ({ page }) => {
-  const messages = await page.locator("#messages .message")
-
   await page.evaluate(() =>
     window.Turbo.renderStreamMessage(`
       <turbo-stream action="append" target="messages">
@@ -69,7 +67,7 @@ test("test receiving a message with a <script> element", async ({ page }) => {
     `)
   )
 
-  assert.deepEqual(await messages.allTextContents(), ["Hello from script"])
+  assert.ok(await waitUntilText(page, "Hello from script"))
 })
 
 test("test overriding with custom StreamActions", async ({ page }) => {
@@ -96,10 +94,10 @@ test("test overriding with custom StreamActions", async ({ page }) => {
     `)
   }, html)
 
-  assert.equal(await page.textContent("#messages"), html, "evaluates custom StreamAction")
+  assert.ok(await waitUntilText(page, "Rendered with Custom Action"), "evaluates custom StreamAction")
 })
 
-test("test receiving a stream message asynchronously", async ({ page }) => {
+test("test receiving a stream message over SSE", async ({ page }) => {
   await page.evaluate(() => {
     document.body.insertAdjacentHTML(
       "afterbegin",
@@ -111,8 +109,8 @@ test("test receiving a stream message asynchronously", async ({ page }) => {
   assert.deepEqual(await messages.allTextContents(), ["First"])
 
   await page.click("#async button")
-  await nextBeat()
 
+  await waitUntilText(page, "Hello world!")
   assert.deepEqual(await messages.allTextContents(), ["First", "Hello world!"])
 
   await page.evaluate(() => document.getElementById("stream-source")?.remove())
diff --git a/src/tests/helpers/page.ts b/src/tests/helpers/page.ts
index 3851eb4f5..45056406e 100644
--- a/src/tests/helpers/page.ts
+++ b/src/tests/helpers/page.ts
@@ -282,6 +282,10 @@ export function waitForPathname(page: Page, pathname: string): Promise<void> {
   return page.waitForURL((url) => url.pathname == pathname)
 }
 
+export function waitUntilText(page: Page, text: string, state: "visible" | "attached" = "visible") {
+  return page.waitForSelector(`text='${text}'`, { state })
+}
+
 export function waitUntilSelector(page: Page, selector: string, state: "visible" | "attached" = "visible") {
   return page.waitForSelector(selector, { state })
 }