diff --git a/test/integration/historical_packets_test.exs b/test/integration/historical_packets_test.exs
index d682402..786e0e2 100644
--- a/test/integration/historical_packets_test.exs
+++ b/test/integration/historical_packets_test.exs
@@ -4,6 +4,15 @@ defmodule Aprs.Integration.HistoricalPacketsTest do
   import Aprs.MockHelpers
   import Phoenix.LiveViewTest
 
+  # Helper functions for mocking
+  defp expect_packets_for_replay(packets) do
+    Mox.expect(PacketsMock, :get_packets_for_replay, fn _opts -> packets end)
+  end
+
+  defp expect_packets_for_replay_with_bounds(packets) do
+    Mox.expect(PacketsMock, :get_packets_for_replay, fn _opts -> packets end)
+  end
+
   setup do
     Mox.set_mox_global()
     Application.put_env(:aprs, :packets_module, Aprs.PacketsMock)
@@ -12,6 +21,15 @@ defmodule Aprs.Integration.HistoricalPacketsTest do
   end
 
   describe "historical packet loading" do
+    # Helper functions for mocking
+    defp expect_packets_for_replay(packets) do
+      Mox.expect(PacketsMock, :get_packets_for_replay, fn _opts -> packets end)
+    end
+
+    defp expect_packets_for_replay_with_bounds(packets) do
+      Mox.expect(PacketsMock, :get_packets_for_replay, fn _opts -> packets end)
+    end
+
     setup do
       # Create test packets with different timestamps
       now = DateTime.utc_now()
@@ -250,6 +268,15 @@ defmodule Aprs.Integration.HistoricalPacketsTest do
   end
 
   describe "live packet updates with historical data" do
+    # Helper functions for mocking
+    defp expect_packets_for_replay(packets) do
+      Mox.expect(PacketsMock, :get_packets_for_replay, fn _opts -> packets end)
+    end
+
+    defp expect_packets_for_replay_with_bounds(packets) do
+      Mox.expect(PacketsMock, :get_packets_for_replay, fn _opts -> packets end)
+    end
+
     setup do
       # Create a historical packet
       now = DateTime.utc_now()