diff --git a/tests/e2e/__init__.py b/tests/e2e/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
new file mode 100644
index 0000000..aedac67
--- /dev/null
+++ b/tests/e2e/conftest.py
@@ -0,0 +1,239 @@
+"""E2E test fixtures.
+
+All fixtures are designed to run without real LLM API keys so the suite is
+CI-safe. The ``mock_llm_provider`` fixture is the cornerstone: it returns a
+MagicMock that satisfies the BaseChatLLM protocol and produces scripted,
+deterministic responses.
+
+Fixture hierarchy
+-----------------
+mock_llm_provider          — base mock LLM, always returns "pong"
+test_agent                 — Agent wired to mock_llm_provider
+test_gateway               — Gateway with a stub channel (message injection)
+test_agent_with_echo_tool  — Agent + registered echo tool for tool-call tests
+mock_llm_with_tool_call    — async factory that exercises the tool-call path
+"""
+
+from __future__ import annotations
+
+import pytest
+from pydantic import BaseModel
+from unittest.mock import AsyncMock, MagicMock
+
+from operator_use.agent.service import Agent
+from operator_use.bus.service import Bus
+from operator_use.bus.views import OutgoingMessage
+from operator_use.gateway.channels.base import BaseChannel
+from operator_use.gateway.service import Gateway
+from operator_use.messages.service import HumanMessage
+from operator_use.orchestrator.service import Orchestrator
+from operator_use.providers.events import LLMEvent, LLMEventType, ToolCall
+from operator_use.agent.tools.service import Tool
+
+
+# ---------------------------------------------------------------------------
+# Stub channel — captures outbound messages for gateway-level tests
+# ---------------------------------------------------------------------------
+
+class _StubChannel(BaseChannel):
+    """Minimal channel that records sent messages and does nothing else."""
+
+    def __init__(self, bus: Bus) -> None:
+        config = MagicMock()
+        config.account_id = ""
+        super().__init__(config=config, bus=bus)
+        self.sent: list[OutgoingMessage] = []
+
+    @property
+    def name(self) -> str:
+        return "stub"
+
+    async def start(self) -> None:
+        pass
+
+    async def stop(self) -> None:
+        self.running = False
+
+    async def _listen(self) -> None:
+        pass
+
+    async def send(self, message: OutgoingMessage) -> int | None:
+        self.sent.append(message)
+        return 1
+
+
+# ---------------------------------------------------------------------------
+# Echo tool — trivial tool used by tool-call tests
+# ---------------------------------------------------------------------------
+
+class _EchoParams(BaseModel):
+    message: str
+
+
+class _EchoTool(Tool):
+    """Returns the input message verbatim. Used to verify tool execution."""
+
+    def __init__(self) -> None:
+        super().__init__(name="echo", description="Echo the input message.", model=_EchoParams)
+
+    def __call__(self, fn):  # decorator-style registration
+        self.function = fn
+        return self
+
+    def run(self, message: str, **kwargs) -> str:  # type: ignore[override]
+        return message
+
+
+def _make_echo_tool() -> _EchoTool:
+    tool = _EchoTool()
+
+    def _fn(message: str, **kwargs):
+        return message
+
+    tool.function = _fn
+    return tool
+
+
+# ---------------------------------------------------------------------------
+# Core fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture()
+def mock_llm_provider():
+    """Mock LLM that always returns 'pong' — no API keys required.
+
+    Satisfies the BaseChatLLM protocol via MagicMock with an AsyncMock
+    ``ainvoke`` that returns a deterministic LLMEvent(TEXT, content="pong").
+    """
+    llm = MagicMock()
+    llm.model_name = "mock-llm-e2e"
+    llm.provider = "mock"
+    llm.astream = None  # force the non-streaming path in Agent._loop
+
+    pong_event = LLMEvent(type=LLMEventType.TEXT, content="pong")
+    llm.ainvoke = AsyncMock(return_value=pong_event)
+    return llm
+
+
+@pytest.fixture()
+def test_agent(mock_llm_provider, tmp_path):
+    """Fully-configured Agent with mock LLM and a temp workspace.
+
+    - No channels, no bus, no cron — pure agent loop.
+    - ``tools=[]`` avoids loading built-in tools that require external deps.
+    - Workspace is isolated per test via pytest's ``tmp_path``.
+    """
+    return Agent(
+        llm=mock_llm_provider,
+        agent_id="e2e-agent",
+        workspace=tmp_path,
+        tools=[],
+        max_iterations=10,
+    )
+
+
+@pytest.fixture()
+def test_gateway():
+    """Gateway with an in-memory stub channel for integration-level tests.
+
+    Returns a tuple (gateway, stub_channel, bus) so tests can inject messages
+    and inspect outbound traffic without starting a real server.
+    """
+    bus = Bus()
+    channel = _StubChannel(bus=bus)
+    gateway = Gateway(bus=bus)
+    gateway.add_channel(channel)
+    return gateway, channel, bus
+
+
+@pytest.fixture()
+def test_agent_with_echo_tool(mock_llm_provider, tmp_path):
+    """Agent pre-loaded with the echo tool for tool-call pipeline tests."""
+    agent = Agent(
+        llm=mock_llm_provider,
+        agent_id="e2e-echo-agent",
+        workspace=tmp_path,
+        tools=[],
+        max_iterations=10,
+    )
+    agent.tool_register.register(_make_echo_tool())
+    return agent
+
+
+@pytest.fixture()
+def mock_llm_with_tool_call(tmp_path):
+    """Factory fixture: configure an agent's LLM to emit a tool_call then TEXT.
+
+    Usage::
+
+        tool_calls = await mock_llm_with_tool_call(agent, "run the echo tool")
+        assert_tool_called(tool_calls, "echo")
+
+    Returns an async callable that:
+    1. Replaces the agent's ``llm.ainvoke`` with a side_effect that first
+       emits a ToolCall for "echo" then a TEXT event.
+    2. Runs the agent and records which tool names were invoked.
+    3. Returns the list of recorded tool names.
+    """
+
+    async def _factory(agent: Agent, text: str, session_id: str = "e2e:tool-call") -> list[str]:
+        tool_event = LLMEvent(
+            type=LLMEventType.TOOL_CALL,
+            tool_call=ToolCall(id="e2e-t1", name="echo", params={"message": "hello from e2e"}),
+        )
+        done_event = LLMEvent(type=LLMEventType.TEXT, content="tool run complete")
+        agent.llm.ainvoke = AsyncMock(side_effect=[tool_event, done_event])
+
+        called_tools: list[str] = []
+        original_aexecute = agent.tool_register.aexecute
+
+        async def _recording_aexecute(name: str, params: dict) -> object:
+            called_tools.append(name)
+            return await original_aexecute(name, params)
+
+        agent.tool_register.aexecute = _recording_aexecute  # type: ignore[method-assign]
+
+        await agent.run(message=HumanMessage(content=text), session_id=session_id)
+        return called_tools
+
+    return _factory
+
+
+@pytest.fixture()
+def test_orchestrator(mock_llm_provider, tmp_path):
+    """Orchestrator wired to a test agent and an in-memory Bus.
+
+    The Orchestrator is the highest-level pipeline coordinator in this codebase:
+    it owns STT/TTS, message building (IncomingMessage → HumanMessage), agent
+    routing, and the outgoing-message construction.  There is no separate
+    "Gateway" involved here because the fixture targets the Orchestrator layer
+    directly, not the full channel-gateway stack.
+
+    ``process_direct()`` is used in tests instead of ``ainvoke()`` so the test
+    can invoke the pipeline synchronously without starting the async consume
+    loop that blocks indefinitely on the bus queue.
+
+    Components wired together:
+    - mock_llm_provider  — deterministic LLM; no API keys required
+    - Agent              — LLM agentic loop; isolated tmp workspace
+    - Bus                — in-memory async queues
+    - Orchestrator       — routes Bus messages to the Agent and back
+
+    Returns an Orchestrator instance ready for use with ``process_direct()``.
+    """
+    bus = Bus()
+    agent = Agent(
+        llm=mock_llm_provider,
+        agent_id="e2e-orchestrator-agent",
+        workspace=tmp_path,
+        tools=[],
+        max_iterations=10,
+        bus=bus,
+    )
+    return Orchestrator(
+        bus=bus,
+        agents={"operator": agent},
+        default_agent="operator",
+        streaming=False,  # disable streaming so tests use the simple ainvoke path
+    )
diff --git a/tests/e2e/helpers.py b/tests/e2e/helpers.py
new file mode 100644
index 0000000..b48c76d
--- /dev/null
+++ b/tests/e2e/helpers.py
@@ -0,0 +1,67 @@
+"""E2E test helper utilities.
+
+Provides three high-level assertions and a message-injection helper so that
+e2e tests can read as plain English rather than as plumbing code.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from operator_use.agent.service import Agent
+    from operator_use.messages.service import AIMessage
+
+
+async def send_message(agent: "Agent", text: str, session_id: str = "e2e:default") -> "AIMessage":
+    """Inject a plain-text message into *agent* and return the AIMessage response.
+
+    No channels, no bus, no real LLM — the agent fixture uses a mock LLM that
+    returns deterministic responses, so this helper is CI-safe.
+
+    Args:
+        agent:      A fully-configured Agent (mock LLM wired in).
+        text:       The human turn text to send.
+        session_id: Session identifier; defaults to an isolated e2e key.
+
+    Returns:
+        The AIMessage produced by the agent's agentic loop.
+    """
+    from operator_use.messages.service import HumanMessage
+
+    msg = HumanMessage(content=text)
+    return await agent.run(message=msg, session_id=session_id)
+
+
+def assert_response_contains(response: "AIMessage", expected: str) -> None:
+    """Assert that *response.content* contains *expected* as a substring.
+
+    Args:
+        response: AIMessage returned by send_message() or agent.run().
+        expected: Substring that must appear in the response content.
+
+    Raises:
+        AssertionError: When the substring is absent.
+    """
+    content = response.content or ""
+    assert expected in content, (
+        f"Expected response to contain {expected!r}, got: {content!r}"
+    )
+
+
+def assert_tool_called(tool_calls: list[str], tool_name: str) -> None:
+    """Assert that *tool_name* appears in the list of recorded tool call names.
+
+    The list is produced by the ``mock_llm_with_tool_call`` fixture which
+    collects tool names as the agent loop executes them.
+
+    Args:
+        tool_calls: List of tool names that were invoked during the run.
+        tool_name:  The tool name that must appear at least once.
+
+    Raises:
+        AssertionError: When the tool was not called.
+    """
+    assert tool_name in tool_calls, (
+        f"Expected tool {tool_name!r} to be called; called tools: {tool_calls!r}"
+    )
diff --git a/tests/e2e/test_smoke.py b/tests/e2e/test_smoke.py
new file mode 100644
index 0000000..b3d7390
--- /dev/null
+++ b/tests/e2e/test_smoke.py
@@ -0,0 +1,66 @@
+"""E2E smoke test — full pipeline: message in → agent processes → response out.
+
+No real LLM API keys required. The mock_llm_provider fixture returns
+scripted, deterministic responses so this suite runs safely in CI.
+"""
+
+import pytest
+
+from tests.e2e.helpers import assert_response_contains, assert_tool_called, send_message
+
+
+# ---------------------------------------------------------------------------
+# Smoke: message → response pipeline (no tool calls)
+# ---------------------------------------------------------------------------
+
+
+@pytest.mark.asyncio
+async def test_smoke_send_message_returns_response(test_agent):
+    """Agent must return a non-empty response for a simple text message."""
+    result = await send_message(test_agent, "Hello, agent!")
+    assert result.content, "Expected a non-empty response from the agent"
+
+
+@pytest.mark.asyncio
+async def test_smoke_response_contains_expected_text(test_agent):
+    """assert_response_contains should pass when the expected substring is present."""
+    result = await send_message(test_agent, "ping")
+    assert_response_contains(result, "pong")
+
+
+@pytest.mark.asyncio
+async def test_smoke_tool_call_is_recorded(test_agent_with_echo_tool, mock_llm_with_tool_call):
+    """assert_tool_called should detect that the echo tool was invoked."""
+    tool_calls = await mock_llm_with_tool_call(test_agent_with_echo_tool, "run the echo tool")
+    assert_tool_called(tool_calls, "echo")
+
+
+@pytest.mark.asyncio
+async def test_smoke_unique_sessions_are_isolated(test_agent):
+    """Two different session IDs must never share history."""
+    from operator_use.messages.service import HumanMessage
+
+    await test_agent.run(message=HumanMessage(content="session A message"), session_id="e2e:session-a")
+    await test_agent.run(message=HumanMessage(content="session B message"), session_id="e2e:session-b")
+
+    session_a = test_agent.sessions.get_or_create("e2e:session-a")
+    session_b = test_agent.sessions.get_or_create("e2e:session-b")
+
+    a_texts = [m.content for m in session_a.messages]
+    b_texts = [m.content for m in session_b.messages]
+
+    assert not any("session B message" in t for t in a_texts if t)
+    assert not any("session A message" in t for t in b_texts if t)
+
+
+@pytest.mark.asyncio
+async def test_orchestrator_routes_message_to_agent(test_orchestrator):
+    """Full pipeline: orchestrator.process_direct() → agent → response.
+
+    Uses process_direct() to invoke the full Orchestrator pipeline
+    (message building → agent routing → LLM loop → response building)
+    without starting the blocking bus consume loop (ainvoke).
+    The mock LLM always returns "pong", so we assert the response is non-empty.
+    """
+    response = await test_orchestrator.process_direct("ping", channel="cli", chat_id="e2e:orch")
+    assert response, "Orchestrator must return a non-empty response for a simple text message"
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 4fb6c3f..13db174 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -186,7 +186,7 @@ async def test_agent_run_with_tool_call_then_text(tmp_path):
 
     # Register a simple echo tool
     from pydantic import BaseModel
-    from operator_use.tools.service import Tool
+    from operator_use.agent.tools.service import Tool
 
     class EchoParams(BaseModel):
         message: str
diff --git a/tests/test_control_center.py b/tests/test_control_center.py
index f3a2e5b..0efe749 100644
--- a/tests/test_control_center.py
+++ b/tests/test_control_center.py
@@ -4,7 +4,7 @@
 import pytest
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from operator_use.agent.tools.builtin.control_center import (
+from operator_use.tools.control_center import (
     control_center,
     _set_plugin_enabled,
     _get_plugin_enabled,
diff --git a/tests/test_local_agents.py b/tests/test_local_agents.py
index 8fd831b..a1b5168 100644
--- a/tests/test_local_agents.py
+++ b/tests/test_local_agents.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from operator_use.agent.tools.builtin.local_agents import LOCAL_AGENT_DELEGATION_CHAIN, localagents
+from operator_use.tools.local_agents import LOCAL_AGENT_DELEGATION_CHAIN, localagents
 from operator_use.messages.service import AIMessage
 
 
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index f6ba6d4..5d9f8b9 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -7,7 +7,7 @@
 from operator_use.agent.tools.registry import ToolRegistry
 from operator_use.agent.hooks.service import Hooks
 from operator_use.agent.hooks.events import HookEvent
-from operator_use.tools.service import Tool
+from operator_use.agent.tools.service import Tool
 from pydantic import BaseModel
 
 
diff --git a/tests/test_tool_registry.py b/tests/test_tool_registry.py
index ca6ed75..77c70b9 100644
--- a/tests/test_tool_registry.py
+++ b/tests/test_tool_registry.py
@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 
 from operator_use.agent.tools.registry import ToolRegistry
-from operator_use.tools.service import Tool
+from operator_use.agent.tools.service import Tool
 
 
 # --- Helpers ---
diff --git a/tests/test_tools.py b/tests/test_tools.py
index 8cbf913..de572ab 100644
--- a/tests/test_tools.py
+++ b/tests/test_tools.py
@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 from typing import Literal
 
-from operator_use.tools.service import Tool, ToolResult
+from operator_use.agent.tools.service import Tool, ToolResult
 
 
 # --- ToolResult ---