diff --git a/crates/goose/src/agents/agent.rs b/crates/goose/src/agents/agent.rs
index a3cad38823d7..256779095d1a 100644
--- a/crates/goose/src/agents/agent.rs
+++ b/crates/goose/src/agents/agent.rs
@@ -58,7 +58,9 @@ use super::platform_tools;
 use super::tool_execution::{ToolCallResult, CHAT_MODE_TOOL_SKIPPED_RESPONSE, DECLINED_RESPONSE};
 use crate::agents::subagent_task_config::TaskConfig;
 use crate::agents::todo_tools::{
-    todo_read_tool, todo_write_tool, TODO_READ_TOOL_NAME, TODO_WRITE_TOOL_NAME,
+    // todo_read_tool, todo_write_tool, // TODO: Re-enable after next release
+    TODO_READ_TOOL_NAME,
+    TODO_WRITE_TOOL_NAME,
 };
 use crate::conversation::message::{Message, ToolRequest};
 
@@ -756,7 +758,8 @@ impl Agent {
             ]);
 
             // Add task planner tools
-            prefixed_tools.extend([todo_read_tool(), todo_write_tool()]);
+            // TODO: Re-enable after next release
+            // prefixed_tools.extend([todo_read_tool(), todo_write_tool()]);
 
             // Dynamic task tool
             prefixed_tools.push(create_dynamic_task_tool());
@@ -1512,6 +1515,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[ignore] // TODO: Re-enable after next release when TODO tools are re-enabled
     async fn test_todo_tools_integration() -> Result<()> {
         let agent = Agent::new();
 
diff --git a/crates/goose/tests/todo_tools_test.rs b/crates/goose/tests/todo_tools_test.rs
index 078d54b29384..6f823d18bb56 100644
--- a/crates/goose/tests/todo_tools_test.rs
+++ b/crates/goose/tests/todo_tools_test.rs
@@ -6,6 +6,7 @@ use serial_test::serial;
 use std::sync::Arc;
 
 #[tokio::test]
+#[ignore] // TODO: Re-enable after next release when TODO tools are re-enabled
 async fn test_todo_tools_in_agent_list() {
     let agent = Agent::new();
     let tools = agent.list_tools(None).await;