diff --git a/mcp_python/server/__init__.py b/mcp_python/server/__init__.py
index 3339db257..c6b73cb25 100644
--- a/mcp_python/server/__init__.py
+++ b/mcp_python/server/__init__.py
@@ -24,6 +24,8 @@
     ListPromptsResult,
     ListResourcesRequest,
     ListResourcesResult,
+    ListToolsRequest,
+    ListToolsResult,
     LoggingLevel,
     ProgressNotification,
     Prompt,
@@ -36,6 +38,7 @@
     ServerResult,
     SetLevelRequest,
     SubscribeRequest,
+    Tool,
     UnsubscribeRequest,
 )
 
@@ -79,7 +82,7 @@ def get_capability(req_type: type) -> dict[str, Any] | None:
         return ServerCapabilities(
             prompts=get_capability(ListPromptsRequest),
             resources=get_capability(ListResourcesRequest),
-            tools=get_capability(ListPromptsRequest),
+            tools=get_capability(ListToolsRequest),
             logging=get_capability(SetLevelRequest),
         )
 
@@ -205,6 +208,7 @@ async def handler(req: ReadResourceRequest):
 
         return decorator
 
+
     def set_logging_level(self):
         from mcp_python.types import EmptyResult
 
@@ -250,6 +254,19 @@ async def handler(req: UnsubscribeRequest):
 
         return decorator
 
+    def list_tools(self):
+        def decorator(func: Callable[[], Awaitable[list[Tool]]]):
+            logger.debug("Registering handler for ListToolsRequest")
+
+            async def handler(_: Any):
+                tools = await func()
+                return ServerResult(ListToolsResult(tools=tools))
+
+            self.request_handlers[ListToolsRequest] = handler
+            return func
+
+        return decorator
+
     def call_tool(self):
         from mcp_python.types import CallToolResult