diff --git a/test/api/stream_test.exs b/test/api/stream_test.exs
index c9bf09259..538728594 100644
--- a/test/api/stream_test.exs
+++ b/test/api/stream_test.exs
@@ -2,6 +2,7 @@ defmodule Api.StreamTest do
   use ExUnit.Case, async: false
   import Test.Support.Helpers
   alias Plug.Conn
+  alias ServerSentEventStage, as: SSES
 
   describe "build_options" do
     setup do
@@ -17,38 +18,22 @@ defmodule Api.StreamTest do
   end
 
   describe "start_link" do
-    setup do
-      bypass = Bypass.open()
-
-      {:ok, %{bypass: bypass}}
-    end
-
-    test "starts a genserver that sends events", %{bypass: bypass} do
-      Bypass.expect(bypass, fn conn ->
-        conn = Conn.send_chunked(conn, 200)
+    @data %{
+      "attributes" => [],
+      "type" => "vehicle",
+      "id" => "vehicle"
+    }
 
-        data = %{
-          "attributes" => [],
-          "type" => "vehicle",
-          "id" => "vehicle"
-        }
-
-        Conn.chunk(conn, "event: reset\ndata: #{Jason.encode!([data])}\n\n")
-        conn
-      end)
+    test "starts a genserver that sends events" do
+      data = @data
 
       assert {:ok, sses} =
-               [
-                 name: :start_link_test,
-                 base_url: "http://localhost:#{bypass.port}",
-                 path: "/vehicles",
-                 params: [
-                   "fields[vehicle]": "direction_id,current_status,longitude,latitude,bearing",
-                   include: "stop,trip"
-                 ]
-               ]
-               |> Api.Stream.build_options()
-               |> ServerSentEventStage.start_link()
+               GenStage.from_enumerable([
+                 %SSES.Event{
+                   event: "reset",
+                   data: Jason.encode!(data)
+                 }
+               ])
 
       assert {:ok, pid} = Api.Stream.start_link(name: __MODULE__, subscribe_to: sses)
 
@@ -58,46 +43,29 @@ defmodule Api.StreamTest do
                |> Enum.take(1)
     end
 
-    # We're seeing occasional failures in this test due to an underlying issue
-    # with the `Bypass` library. There is an
-    # [open issue on Bypass's github](https://github.com/PSPDFKit-labs/bypass/issues/120).
-    test "handles api events", %{bypass: bypass} do
-      Bypass.expect(bypass, fn conn ->
-        conn = Conn.send_chunked(conn, 200)
-
-        data = %{
-          "attributes" => [],
-          "type" => "vehicle",
-          "id" => "vehicle"
-        }
-
-        {:ok, conn} = Conn.chunk(conn, "event: ignores unexpected events\n\n")
-        {:ok, conn} = Conn.chunk(conn, "ignored garbled data\n\n")
-        {:ok, conn} = Conn.chunk(conn, "event: reset\ndata: #{Jason.encode!([data])}\n\n")
-        {:ok, conn} = Conn.chunk(conn, "event: add\ndata: #{Jason.encode!(data)}\n\n")
-        {:ok, conn} = Conn.chunk(conn, "event: update\ndata: #{Jason.encode!(data)}\n\n")
-        {:ok, conn} = Conn.chunk(conn, "event: remove\ndata: #{Jason.encode!(data)}\n\n")
-        conn
-      end)
+    test "handles api events" do
+      data = @data
 
       assert {:ok, sses} =
-               [
-                 base_url: "http://localhost:#{bypass.port}",
-                 path: "/vehicles"
-               ]
-               |> Api.Stream.build_options()
-               |> ServerSentEventStage.start_link()
+               GenStage.from_enumerable([
+                 %SSES.Event{event: "ignores unexpected events"},
+                 # garbled data contains no data and the `event` is `message`
+                 %SSES.Event{event: "message"},
+                 %SSES.Event{event: "reset", data: Jason.encode!([data])},
+                 %SSES.Event{event: "add", data: Jason.encode!(data)},
+                 %SSES.Event{event: "update", data: Jason.encode!(data)},
+                 %SSES.Event{event: "remove", data: Jason.encode!(data)}
+               ])
 
       assert {:ok, pid} = Api.Stream.start_link(name: __MODULE__, subscribe_to: sses)
 
-      stream = GenStage.stream([pid])
-
-      assert [
-               %Api.Stream.Event{event: :reset},
-               %Api.Stream.Event{event: :add},
-               %Api.Stream.Event{event: :update},
-               %Api.Stream.Event{event: :remove}
-             ] = Enum.take(stream, 4)
+      stream =
+        assert [
+                 %Api.Stream.Event{event: :reset},
+                 %Api.Stream.Event{event: :add},
+                 %Api.Stream.Event{event: :update},
+                 %Api.Stream.Event{event: :remove}
+               ] = [pid] |> GenStage.stream() |> Enum.take(4)
     end
   end
 end