diff --git a/tests/test_help_command.py b/tests/test_help_command.py
new file mode 100644
index 0000000..99ff114
--- /dev/null
+++ b/tests/test_help_command.py
@@ -0,0 +1,85 @@
+"""Tests for the standalone help command."""
+
+import pytest
+from unittest.mock import AsyncMock, MagicMock
+
+from mudlib import commands
+
+# Import command modules to register their commands
+from mudlib.commands import (
+    help,  # noqa: F401
+    look,  # noqa: F401
+    movement,  # noqa: F401
+)
+
+
+@pytest.fixture
+def mock_writer():
+    writer = MagicMock()
+    writer.write = MagicMock()
+    writer.drain = AsyncMock()
+    return writer
+
+
+@pytest.fixture
+def mock_reader():
+    return MagicMock()
+
+
+@pytest.fixture
+def player(mock_reader, mock_writer):
+    from mudlib.player import Player
+
+    return Player(
+        name="TestPlayer", x=5, y=5, reader=mock_reader, writer=mock_writer
+    )
+
+
+@pytest.mark.asyncio
+async def test_help_command_is_registered():
+    """The help command should be registered in the command registry."""
+    assert "help" in commands._registry
+
+
+@pytest.mark.asyncio
+async def test_help_has_wildcard_mode():
+    """Help should work from any mode."""
+    cmd_def = commands._registry["help"]
+    assert cmd_def.mode == "*"
+
+
+@pytest.mark.asyncio
+async def test_help_no_args_shows_usage(player):
+    """help with no args shows usage hint."""
+    await commands.dispatch(player, "help")
+    output = "".join([call[0][0] for call in player.writer.write.call_args_list])
+    assert "help <command>" in output
+    assert "commands" in output
+    assert "skills" in output
+
+
+@pytest.mark.asyncio
+async def test_help_known_command_shows_detail(player):
+    """help <known command> shows detail view."""
+    await commands.dispatch(player, "help look")
+    output = "".join([call[0][0] for call in player.writer.write.call_args_list])
+    assert "look" in output.lower()
+    assert "mode:" in output.lower()
+
+
+@pytest.mark.asyncio
+async def test_help_unknown_command_shows_error(player):
+    """help <unknown> shows error message."""
+    await commands.dispatch(player, "help nonexistent")
+    output = "".join([call[0][0] for call in player.writer.write.call_args_list])
+    assert "nonexistent" in output.lower()
+    assert ("unknown" in output.lower() or "not found" in output.lower())
+
+
+@pytest.mark.asyncio
+async def test_help_and_commands_both_exist():
+    """Both help and commands should be registered independently."""
+    assert "help" in commands._registry
+    assert "commands" in commands._registry
+    # They should be different functions
+    assert commands._registry["help"].func != commands._registry["commands"].func