diff --git a/tests/helpers.lua b/tests/helpers.lua
index ad640d9e..a7e00b73 100644
--- a/tests/helpers.lua
+++ b/tests/helpers.lua
@@ -21,12 +21,11 @@ function M.replay_setup()
   end
 
   state.current_mode = 'build' -- default mode for tests
-  state.windows = ui.create_windows()
 
-  -- we use the event manager to dispatch events
+  -- we use the event manager to dispatch events, have to setup before ui.create_windows
   require('opencode.event_manager').setup()
 
-  renderer.setup_subscriptions()
+  state.windows = ui.create_windows()
 
   renderer.reset()
 
diff --git a/tests/manual/renderer_replay.lua b/tests/manual/renderer_replay.lua
index 3070d733..dfe3d5c8 100644
--- a/tests/manual/renderer_replay.lua
+++ b/tests/manual/renderer_replay.lua
@@ -196,13 +196,14 @@ function M.replay_full_session()
   end
 
   state.active_session = helpers.get_session_from_events(M.events, true)
-  local session_data = helpers.load_session_from_events(M.events)
+  vim.schedule(function()
+    local session_data = helpers.load_session_from_events(M.events)
 
-  renderer.reset()
-  renderer._render_full_session_data(session_data)
-  state.job_count = 0
+    renderer._render_full_session_data(session_data)
+    state.job_count = 0
 
-  vim.notify('Rendered full session from loaded events', vim.log.levels.INFO)
+    vim.notify('Rendered full session from loaded events', vim.log.levels.INFO)
+  end)
   return true
 end