diff --git a/tests/fixtures/architecture/dependency-baseline.json b/tests/fixtures/architecture/dependency-baseline.json
index 78fc37996..fd34e1312 100644
--- a/tests/fixtures/architecture/dependency-baseline.json
+++ b/tests/fixtures/architecture/dependency-baseline.json
@@ -13,8 +13,8 @@
     "runtime_to_db": [],
     "workflow_to_db": []
   },
-  "edge_count": 6419,
-  "edge_sha256": "58a002380592d49f9b78e05b6f03b1950b8622213396e160917d7e2f73887527",
+  "edge_count": 6420,
+  "edge_sha256": "0e5b5cc00f36ed87ec8e6ae8d09f7a3756d8488302907e12db239bb981c98d5c",
   "edges": [
     "app -> app.runtime",
     "app -> app.runtime.compat",
@@ -3260,6 +3260,7 @@
     "app.chain.subscribe -> app.application.configuration",
     "app.chain.subscribe -> app.application.mediaserver",
     "app.chain.subscribe -> app.application.messaging",
+    "app.chain.subscribe -> app.application.messaging.message",
     "app.chain.subscribe -> app.application.messaging.subscribe",
     "app.chain.subscribe -> app.application.subscription",
     "app.chain.subscribe -> app.application.subscription.complete",
diff --git a/tests/test_agent_lifecycle.py b/tests/test_agent_lifecycle.py
index f5519c85b..8c6209fa7 100644
--- a/tests/test_agent_lifecycle.py
+++ b/tests/test_agent_lifecycle.py
@@ -4,9 +4,9 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 
 import app.agent.orchestrator as agent_module
-from app.agent import AgentManager
 from app.agent.orchestrator import (
     AGENT_SESSION_QUEUE_MAX_SIZE,
+    AgentManager,
     AgentManagerQueueFullError,
     AgentManagerUnavailableError,
 )
diff --git a/tests/test_db_declarative_2_0.py b/tests/test_db_declarative_2_0.py
index 56d153736..55959ec6b 100644
--- a/tests/test_db_declarative_2_0.py
+++ b/tests/test_db_declarative_2_0.py
@@ -16,7 +16,7 @@ from pathlib import Path
 import pytest
 from sqlalchemy.orm import DeclarativeBase
 
-from app.db import Base
+from app.db.base import Base
 from app.db.models import load_all_models