diff --git a/crates/openshell-server/src/grpc/sandbox.rs b/crates/openshell-server/src/grpc/sandbox.rs
index 71951cb98..63f8ee857 100644
--- a/crates/openshell-server/src/grpc/sandbox.rs
+++ b/crates/openshell-server/src/grpc/sandbox.rs
@@ -2607,9 +2607,9 @@ mod tests {
         drop(stream);
         drop(request_span);
 
-        tokio::time::timeout(std::time::Duration::from_millis(200), async {
+        tokio::time::timeout(std::time::Duration::from_secs(5), async {
             while traced.spans_named("disconnected_watch_request").is_empty() {
-                tokio::task::yield_now().await;
+                tokio::time::sleep(std::time::Duration::from_millis(10)).await;
             }
         })
         .await