diff --git a/src/openhuman/channels/providers/web/mod.rs b/src/openhuman/channels/providers/web/mod.rs
index b629b4339..deb7e65a5 100644
--- a/src/openhuman/channels/providers/web/mod.rs
+++ b/src/openhuman/channels/providers/web/mod.rs
@@ -50,6 +50,25 @@ pub(crate) use ops::{event_session_id_for, key_for};
 pub(crate) use progress_bridge::spawn_progress_bridge;
 
 // Schema field helpers re-exported for tests
+#[cfg(any(test, debug_assertions))]
+#[allow(unused_imports)]
+pub(crate) use schemas::{
+    json_output, optional_bool, optional_f64, optional_string, optional_u64, required_string,
+};
+#[cfg(any(test, debug_assertions))]
+#[allow(unused_imports)]
+pub(crate) use session::{
+    compose_system_prompt_suffix, locale_reply_directive, normalize_model_override,
+    provider_role_for_model_override,
+};
+#[cfg(any(test, debug_assertions))]
+#[allow(unused_imports)]
+pub(crate) use types::WebChatParams;
+#[cfg(any(test, debug_assertions))]
+#[allow(unused_imports)]
+pub(crate) use web_errors::{
+    inference_budget_exceeded_user_message, is_inference_budget_exceeded_error,
+};
 
 // Test helpers (debug/test builds only)
 #[cfg(any(test, debug_assertions))]
diff --git a/src/openhuman/config/schema/load_tests.rs b/src/openhuman/config/schema/load_tests.rs
index f211b18cb..27d03b1a1 100644
--- a/src/openhuman/config/schema/load_tests.rs
+++ b/src/openhuman/config/schema/load_tests.rs
@@ -1,3 +1,5 @@
+use super::dirs::{ACTION_DIR_ENV_VAR, MEMORY_SYNC_INTERVAL_SECS_ENV_VAR};
+use super::env::EnvLookup;
 use super::*;
 use crate::openhuman::config::schema::{StreamMode, TelegramConfig};
 
diff --git a/src/openhuman/config/schemas/mod.rs b/src/openhuman/config/schemas/mod.rs
index 1518fa719..998101865 100644
--- a/src/openhuman/config/schemas/mod.rs
+++ b/src/openhuman/config/schemas/mod.rs
@@ -27,6 +27,8 @@ use helpers::{
     DEFAULT_ONBOARDING_FLAG_NAME,
 };
 #[cfg(test)]
+use schema_defs::schemas;
+#[cfg(test)]
 use serde_json::{Map, Value};
 
 #[cfg(test)]
diff --git a/src/openhuman/inference/local/service/ollama_admin_tests.rs b/src/openhuman/inference/local/service/ollama_admin_tests.rs
index b0b077e8a..8637c2083 100644
--- a/src/openhuman/inference/local/service/ollama_admin_tests.rs
+++ b/src/openhuman/inference/local/service/ollama_admin_tests.rs
@@ -1,4 +1,4 @@
-use super::interrupted_pull_settle_window_secs;
+use super::util::interrupted_pull_settle_window_secs;
 
 #[test]
 fn interrupted_pull_waits_when_bytes_were_observed() {
diff --git a/src/openhuman/inference/provider/reliable_tests.rs b/src/openhuman/inference/provider/reliable_tests.rs
index 0f4bb7edc..377bb08e4 100644
--- a/src/openhuman/inference/provider/reliable_tests.rs
+++ b/src/openhuman/inference/provider/reliable_tests.rs
@@ -1,4 +1,5 @@
 use super::*;
+use crate::openhuman::inference::provider::traits::StreamError;
 use std::sync::Arc;
 
 struct MockProvider {
diff --git a/src/openhuman/mcp_server/tools_tests.rs b/src/openhuman/mcp_server/tools_tests.rs
index bf7af5be5..35c802abc 100644
--- a/src/openhuman/mcp_server/tools_tests.rs
+++ b/src/openhuman/mcp_server/tools_tests.rs
@@ -1,3 +1,4 @@
+use super::specs::list_tools_result_for_config;
 use super::*;
 
 #[test]
diff --git a/src/openhuman/memory/chat.rs b/src/openhuman/memory/chat.rs
index 0f9016f4f..981edd43c 100644
--- a/src/openhuman/memory/chat.rs
+++ b/src/openhuman/memory/chat.rs
@@ -266,6 +266,7 @@ pub mod test_override {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::openhuman::config::schema::DEFAULT_CLOUD_LLM_MODEL;
 
     #[test]
     fn build_provider_returns_inference_wrapper_when_default() {
diff --git a/src/openhuman/memory/schema_tests.rs b/src/openhuman/memory/schema_tests.rs
index 77ed48e6b..549765b64 100644
--- a/src/openhuman/memory/schema_tests.rs
+++ b/src/openhuman/memory/schema_tests.rs
@@ -1,3 +1,4 @@
+use super::definitions::NAMESPACE;
 use super::*;
 
 #[test]
diff --git a/src/openhuman/memory/tree_source/file.rs b/src/openhuman/memory/tree_source/file.rs
index b91ada735..c7981150a 100644
--- a/src/openhuman/memory/tree_source/file.rs
+++ b/src/openhuman/memory/tree_source/file.rs
@@ -134,6 +134,7 @@ fn write_atomic(path: &Path, bytes: &[u8]) -> Result<()> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::openhuman::memory_store::trees::types::{TreeKind, TreeStatus};
     use chrono::TimeZone;
     use tempfile::TempDir;
 
diff --git a/src/openhuman/sandbox/docker.rs b/src/openhuman/sandbox/docker.rs
index fcaea1588..1f3f69670 100644
--- a/src/openhuman/sandbox/docker.rs
+++ b/src/openhuman/sandbox/docker.rs
@@ -288,6 +288,7 @@ pub fn validate_docker_policy(policy: &SandboxPolicy) -> Result<(), Vec<String>>
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::openhuman::sandbox::types::DockerOverrides;
     use std::path::PathBuf;
 
     fn test_policy() -> SandboxPolicy {