diff --git a/crates/chat-cli/src/auth/builder_id.rs b/crates/chat-cli/src/auth/builder_id.rs
index f016fb986c..f62fc29ac6 100644
--- a/crates/chat-cli/src/auth/builder_id.rs
+++ b/crates/chat-cli/src/auth/builder_id.rs
@@ -69,7 +69,7 @@ impl std::fmt::Display for OAuthFlow {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
             OAuthFlow::DeviceCode => write!(f, "DeviceCode"),
-            OAuthFlow::Pkce => write!(f, "PKCE"),
+            OAuthFlow::Pkce => write!(f, "Pkce"),
         }
     }
 }
@@ -593,7 +593,7 @@ mod tests {
     #[test]
     fn test_oauth_flow_ser_deser() {
         test_ser_deser!(OAuthFlow, OAuthFlow::DeviceCode, "DeviceCode");
-        test_ser_deser!(OAuthFlow, OAuthFlow::Pkce, "PKCE");
+        test_ser_deser!(OAuthFlow, OAuthFlow::Pkce, "Pkce");
     }
 
     #[test]
diff --git a/crates/chat-cli/src/auth/secret_store/sqlite.rs b/crates/chat-cli/src/auth/secret_store/sqlite.rs
index 9870ee5edd..51f6024c41 100644
--- a/crates/chat-cli/src/auth/secret_store/sqlite.rs
+++ b/crates/chat-cli/src/auth/secret_store/sqlite.rs
@@ -1,6 +1,5 @@
 #![allow(dead_code)]
 use super::Secret;
-use crate::Result;
 use crate::auth::AuthError;
 use crate::settings::sqlite::{
     Db,
diff --git a/crates/chat-cli/src/cli/chat/conversation_state.rs b/crates/chat-cli/src/cli/chat/conversation_state.rs
index dca132cdce..b1cfe073f5 100644
--- a/crates/chat-cli/src/cli/chat/conversation_state.rs
+++ b/crates/chat-cli/src/cli/chat/conversation_state.rs
@@ -987,7 +987,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_conversation_state_additional_context() {
-        tracing_subscriber::fmt::try_init().ok();
+        // tracing_subscriber::fmt::try_init().ok();
 
         let mut tool_manager = ToolManager::default();
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
diff --git a/crates/chat-cli/src/cli/chat/mod.rs b/crates/chat-cli/src/cli/chat/mod.rs
index 42febea965..b73305b4c2 100644
--- a/crates/chat-cli/src/cli/chat/mod.rs
+++ b/crates/chat-cli/src/cli/chat/mod.rs
@@ -3384,7 +3384,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_flow() {
-        let _ = tracing_subscriber::fmt::try_init();
+        // let _ = tracing_subscriber::fmt::try_init();
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
         let test_client = create_stream(serde_json::json!([
             [
@@ -3438,7 +3438,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_flow_tool_permissions() {
-        let _ = tracing_subscriber::fmt::try_init();
+        // let _ = tracing_subscriber::fmt::try_init();
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
         let test_client = create_stream(serde_json::json!([
             [
@@ -3584,7 +3584,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_flow_multiple_tools() {
-        let _ = tracing_subscriber::fmt::try_init();
+        // let _ = tracing_subscriber::fmt::try_init();
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
         let test_client = create_stream(serde_json::json!([
             [
@@ -3678,7 +3678,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_flow_tools_trust_all() {
-        let _ = tracing_subscriber::fmt::try_init();
+        // let _ = tracing_subscriber::fmt::try_init();
         let ctx = Context::builder().with_test_home().await.unwrap().build_fake();
         let test_client = create_stream(serde_json::json!([
             [
diff --git a/crates/chat-cli/src/cli/chat/parser.rs b/crates/chat-cli/src/cli/chat/parser.rs
index f4c51a4c34..e382065f8e 100644
--- a/crates/chat-cli/src/cli/chat/parser.rs
+++ b/crates/chat-cli/src/cli/chat/parser.rs
@@ -320,7 +320,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_parse() {
-        let _ = tracing_subscriber::fmt::try_init();
+        // let _ = tracing_subscriber::fmt::try_init();
         let tool_use_id = "TEST_ID".to_string();
         let tool_name = "execute_bash".to_string();
         let tool_args = serde_json::json!({
diff --git a/crates/chat-cli/src/cli/mod.rs b/crates/chat-cli/src/cli/mod.rs
index f9230cea74..73c12fc869 100644
--- a/crates/chat-cli/src/cli/mod.rs
+++ b/crates/chat-cli/src/cli/mod.rs
@@ -151,7 +151,7 @@ const HELP_TEXT: &str = color_print::cstr! {"
 "};
 
 #[derive(Debug, Parser, PartialEq, Default)]
-#[command(version, about, name = crate::CHAT_BINARY_NAME, help_template = HELP_TEXT)]
+#[command(version, about, name = crate::util::CHAT_BINARY_NAME, help_template = HELP_TEXT)]
 pub struct Cli {
     #[command(subcommand)]
     pub subcommand: Option<CliRootCommands>,
diff --git a/crates/chat-cli/src/mcp_client/client.rs b/crates/chat-cli/src/mcp_client/client.rs
index 9dc9f6bc98..2941f6bb46 100644
--- a/crates/chat-cli/src/mcp_client/client.rs
+++ b/crates/chat-cli/src/mcp_client/client.rs
@@ -540,6 +540,7 @@ mod tests {
         PathBuf::from(workspace_root)
     }
 
+    #[ignore = "TODO: support test binary"]
     #[tokio::test(flavor = "multi_thread")]
     async fn test_client_stdio() {
         std::process::Command::new("cargo")
diff --git a/crates/chat-cli/src/platform/env.rs b/crates/chat-cli/src/platform/env.rs
index f61b1feaa4..fe731a55e9 100644
--- a/crates/chat-cli/src/platform/env.rs
+++ b/crates/chat-cli/src/platform/env.rs
@@ -52,10 +52,7 @@ mod inner {
 
 impl Env {
     pub fn new() -> Self {
-        match cfg!(test) {
-            true => Self(inner::Inner::Fake(Arc::new(Mutex::new(inner::Fake::default())))),
-            false => Self::default(),
-        }
+        Self::default()
     }
 
     /// Create a fake process environment from a slice of tuples.
@@ -213,7 +210,7 @@ mod tests {
 
     #[test]
     fn test_default_current_dir() {
-        let env = Env::new();
+        let env = Env::from_slice(&[]);
         assert_eq!(env.current_dir().unwrap(), PathBuf::from("/"));
     }
 }
diff --git a/crates/chat-cli/src/platform/fs.rs b/crates/chat-cli/src/platform/fs.rs
index 09dd9c2a0b..504d83a10d 100644
--- a/crates/chat-cli/src/platform/fs.rs
+++ b/crates/chat-cli/src/platform/fs.rs
@@ -39,10 +39,7 @@ mod inner {
 
 impl Fs {
     pub fn new() -> Self {
-        match cfg!(test) {
-            true => Self(inner::Inner::Fake(Arc::new(Mutex::new(HashMap::new())))),
-            false => Self::default(),
-        }
+        Self::default()
     }
 
     pub fn new_chroot() -> Self {
@@ -484,7 +481,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_read_to_string() {
-        let fs = Fs::new();
+        let fs = Fs::new_chroot();
         fs.write("fake", "contents").await.unwrap();
         fs.write("invalid_utf8", &[255]).await.unwrap();
 
diff --git a/crates/chat-cli/src/settings/sqlite.rs b/crates/chat-cli/src/settings/sqlite.rs
index 8c13544bb6..34cd4fe8d4 100644
--- a/crates/chat-cli/src/settings/sqlite.rs
+++ b/crates/chat-cli/src/settings/sqlite.rs
@@ -326,7 +326,7 @@ mod tests {
         );
 
         // Assert all the files in migrations/ are in the list
-        let migration_folder = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src/sqlite/migrations");
+        let migration_folder = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src/settings/sqlite_migrations");
         let migration_count = std::fs::read_dir(migration_folder).unwrap().count();
         assert_eq!(MIGRATIONS.len(), migration_count);
     }
diff --git a/crates/chat-cli/src/util/directories.rs b/crates/chat-cli/src/util/directories.rs
index afca65a080..925c7471ad 100644
--- a/crates/chat-cli/src/util/directories.rs
+++ b/crates/chat-cli/src/util/directories.rs
@@ -113,7 +113,7 @@ pub fn runtime_dir() -> Result<PathBuf> {
 pub fn logs_dir() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(unix)] {
-            use crate::CHAT_BINARY_NAME;
+            use crate::util::CHAT_BINARY_NAME;
             Ok(runtime_dir()?.join(format!("{CHAT_BINARY_NAME}log")))
         } else if #[cfg(windows)] {
             Ok(std::env::temp_dir().join("amazon-q").join("logs"))