diff --git a/metagpt/tools/tool_registry.py b/metagpt/tools/tool_registry.py
index e6519bba9..2c59cd198 100644
--- a/metagpt/tools/tool_registry.py
+++ b/metagpt/tools/tool_registry.py
@@ -50,7 +50,8 @@ class ToolRegistry:
                 return
 
         with open(schema_path, "r", encoding="utf-8") as f:
-            schema = yaml.safe_load(f)[tool_name]
+            schema_dict = yaml.safe_load(f)
+            schema = schema_dict.get(tool_name) or dict(schema_dict.values())
         schema["tool_path"] = tool_path  # corresponding code file path of the tool
         try:
             ToolSchema(**schema)  # validation
diff --git a/tests/metagpt/tools/test_tool_registry.py b/tests/metagpt/tools/test_tool_registry.py
new file mode 100644
index 000000000..fd758b141
--- /dev/null
+++ b/tests/metagpt/tools/test_tool_registry.py
@@ -0,0 +1,101 @@
+import pytest
+
+from metagpt.tools.tool_registry import ToolRegistry
+from metagpt.tools.tool_types import ToolType
+
+
+@pytest.fixture
+def tool_registry():
+    return ToolRegistry()
+
+
+@pytest.fixture
+def schema_yaml(mocker):
+    mock_yaml_content = """
+    tool_name:
+        key1: value1
+        key2: value2
+    """
+    mocker.patch("os.path.exists", return_value=True)
+    mocker.patch("builtins.open", mocker.mock_open(read_data=mock_yaml_content))
+    return mocker
+
+
+# Test Initialization
+def test_initialization(tool_registry):
+    assert isinstance(tool_registry, ToolRegistry)
+    assert tool_registry.tools == {}
+    assert tool_registry.tool_types == {}
+    assert tool_registry.tools_by_types == {}
+
+
+# Test Tool Type Registration
+def test_register_tool_type(tool_registry):
+    tool_type = ToolType(name="TestType", desc="test")
+    tool_registry.register_tool_type(tool_type)
+    assert "TestType" in tool_registry.tool_types
+
+
+# Test Tool Registration
+def test_register_tool(tool_registry, schema_yaml):
+    tool_registry.register_tool("TestTool", "/path/to/tool")
+    assert "TestTool" in tool_registry.tools
+
+
+# Test Tool Registration with Non-existing Schema
+def test_register_tool_no_schema(tool_registry, mocker):
+    mocker.patch("os.path.exists", return_value=False)
+    tool_registry.register_tool("TestTool", "/path/to/tool")
+    assert "TestTool" not in tool_registry.tools
+
+
+# Test Tool Existence Checks
+def test_has_tool(tool_registry, schema_yaml):
+    tool_registry.register_tool("TestTool", "/path/to/tool")
+    assert tool_registry.has_tool("TestTool")
+    assert not tool_registry.has_tool("NonexistentTool")
+
+
+# Test Tool Retrieval
+def test_get_tool(tool_registry, schema_yaml):
+    tool_registry.register_tool("TestTool", "/path/to/tool")
+    tool = tool_registry.get_tool("TestTool")
+    assert tool is not None
+    assert tool.name == "TestTool"
+    assert tool.path == "/path/to/tool"
+
+
+# Similar tests for has_tool_type, get_tool_type, get_tools_by_type
+def test_has_tool_type(tool_registry):
+    tool_type = ToolType(name="TestType", desc="test")
+    tool_registry.register_tool_type(tool_type)
+    assert tool_registry.has_tool_type("TestType")
+    assert not tool_registry.has_tool_type("NonexistentType")
+
+
+def test_get_tool_type(tool_registry):
+    tool_type = ToolType(name="TestType", desc="test")
+    tool_registry.register_tool_type(tool_type)
+    retrieved_type = tool_registry.get_tool_type("TestType")
+    assert retrieved_type is not None
+    assert retrieved_type.name == "TestType"
+
+
+def test_get_tools_by_type(tool_registry, schema_yaml):
+    tool_type_name = "TestType"
+    tool_name = "TestTool"
+    tool_path = "/path/to/tool"
+    tool_type = ToolType(name=tool_type_name, desc="test")
+    tool_registry.register_tool_type(tool_type)
+
+    tool_registry.register_tool(tool_name, tool_path, tool_type_name=tool_type_name)
+
+    tools_by_type = tool_registry.get_tools_by_type(tool_type_name)
+    assert tools_by_type is not None
+    assert tool_name in tools_by_type
+
+
+# Test case for when the tool type does not exist
+def test_get_tools_by_nonexistent_type(tool_registry):
+    tools_by_type = tool_registry.get_tools_by_type("NonexistentType")
+    assert tools_by_type is None