diff --git a/crates/goose/src/providers/formats/databricks.rs b/crates/goose/src/providers/formats/databricks.rs
index 54668e9dfe..cbc047e6ee 100644
--- a/crates/goose/src/providers/formats/databricks.rs
+++ b/crates/goose/src/providers/formats/databricks.rs
@@ -263,7 +263,7 @@ pub fn format_tools(tools: &[Tool], model_name: &str) -> anyhow::Result<Vec<Valu
     let mut tool_names = std::collections::HashSet::new();
     let mut result = Vec::new();
 
-    let is_gemini = model_name.starts_with("gemini");
+    let is_gemini = model_name.contains("gemini");
 
     for tool in tools {
         if !tool_names.insert(&tool.name) {
@@ -697,7 +697,11 @@ mod tests {
             "http://json-schema.org/draft-07/schema#"
         );
 
-        let spec = format_tools(&[tool], "gemini-2-5-flash")?;
+        let spec = format_tools(&[tool.clone()], "gemini-2-5-flash")?;
+        assert!(spec[0]["function"]["parameters"].get("$schema").is_none());
+        assert_eq!(spec[0]["function"]["parameters"]["type"], "object");
+
+        let spec = format_tools(&[tool], "databricks-gemini-3-pro")?;
         assert!(spec[0]["function"]["parameters"].get("$schema").is_none());
         assert_eq!(spec[0]["function"]["parameters"]["type"], "object");