diff --git a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs
index c1db4c3864..cdbaed21bf 100644
--- a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs
+++ b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs
@@ -1559,15 +1559,14 @@ async fn guardian_v2_routes_scoped_tool_approvals(
             })
             .await?;
         }
+        let turn = wait_for_matching_analytics_event(&analytics_server, TIMEOUT, |event| {
+            event["event_type"] == "codex_turn_event"
+                && event["event_params"]["thread_id"] == reviewed_thread_id
+        })
+        .await?;
         timeout(TIMEOUT, app_server.shutdown_gracefully()).await??;
         let events = captured_analytics_events(&analytics_server).await;
-        let turn = &events
-            .iter()
-            .find(|event| {
-                event["event_type"] == "codex_turn_event"
-                    && event["event_params"]["thread_id"] == reviewed_thread_id
-            })
-            .expect("parent turn analytics")["event_params"];
+        let turn = &turn["event_params"];
         assert_eq!(turn["guardian_v2_enabled"], classifier_in_scope);
         let classification = events.iter().find(|event| {
             event["event_type"] == "codex_guardian_v2_classification"