diff --git a/Sources/MCP/Server/Server.swift b/Sources/MCP/Server/Server.swift
index 66dd6baf..48f9e336 100644
--- a/Sources/MCP/Server/Server.swift
+++ b/Sources/MCP/Server/Server.swift
@@ -221,6 +221,7 @@ public actor Server {
                 await logger?.error(
                     "Fatal error in message handling loop", metadata: ["error": "\(error)"])
             }
+            await logger?.info("Server finished", metadata: [:])
         }
     }
 
@@ -234,6 +235,10 @@ public actor Server {
         connection = nil
     }
 
+    public func waitUntilCompleted() async {
+        await task?.value
+    }
+
     // MARK: - Registration
 
     /// Register a method handler