diff --git a/crates/mesh-llm-host-runtime/src/api/tests/apply_config_diagnostics.rs b/crates/mesh-llm-host-runtime/src/api/tests/apply_config_diagnostics.rs
index b9354537ca..502b7ce9fb 100644
--- a/crates/mesh-llm-host-runtime/src/api/tests/apply_config_diagnostics.rs
+++ b/crates/mesh-llm-host-runtime/src/api/tests/apply_config_diagnostics.rs
@@ -42,7 +42,7 @@ async fn control_plane_api_apply_config_serializes_structured_diagnostics() {
     let temp = tempfile::tempdir().unwrap();
     let _home_guard = HomeEnvGuard::set(temp.path());
     let owner = OwnerKeypair::generate();
-    let keystore_path = default_keystore_path().unwrap();
+    let keystore_path = temp.path().join("owner-keystore.json");
     save_keystore(&keystore_path, &owner, None, true).unwrap();
 
     let OwnerControlApplyTestServer {
@@ -125,7 +125,7 @@ async fn control_plane_api_apply_config_serializes_success_warning_diagnostics()
     let temp = tempfile::tempdir().unwrap();
     let _home_guard = HomeEnvGuard::set(temp.path());
     let owner = OwnerKeypair::generate();
-    let keystore_path = default_keystore_path().unwrap();
+    let keystore_path = temp.path().join("owner-keystore.json");
     save_keystore(&keystore_path, &owner, None, true).unwrap();
 
     let OwnerControlApplyTestServer {
diff --git a/crates/mesh-llm-host-runtime/src/api/tests/control_plane.rs b/crates/mesh-llm-host-runtime/src/api/tests/control_plane.rs
index afe9c0acb8..d659cf5d0b 100644
--- a/crates/mesh-llm-host-runtime/src/api/tests/control_plane.rs
+++ b/crates/mesh-llm-host-runtime/src/api/tests/control_plane.rs
@@ -183,7 +183,7 @@ async fn control_plane_api_cli_requires_explicit_endpoint_and_runs_local_orchest
     let temp = tempfile::tempdir().unwrap();
     let _home_guard = HomeEnvGuard::set(temp.path());
     let owner = OwnerKeypair::generate();
-    let keystore_path = default_keystore_path().unwrap();
+    let keystore_path = temp.path().join("owner-keystore.json");
     save_keystore(&keystore_path, &owner, None, true).unwrap();
 
     let control_server = spawn_owner_control_test_server().await;
@@ -231,7 +231,7 @@ async fn control_plane_api_apply_config_uses_full_mesh_config_contract() {
     let temp = tempfile::tempdir().unwrap();
     let _home_guard = HomeEnvGuard::set(temp.path());
     let owner = OwnerKeypair::generate();
-    let keystore_path = default_keystore_path().unwrap();
+    let keystore_path = temp.path().join("owner-keystore.json");
     save_keystore(&keystore_path, &owner, None, true).unwrap();
 
     let get_server = spawn_owner_control_test_server().await;
@@ -323,7 +323,7 @@ async fn control_plane_api_apply_config_reports_revision_conflict() {
     let temp = tempfile::tempdir().unwrap();
     let _home_guard = HomeEnvGuard::set(temp.path());
     let owner = OwnerKeypair::generate();
-    let keystore_path = default_keystore_path().unwrap();
+    let keystore_path = temp.path().join("owner-keystore.json");
     save_keystore(&keystore_path, &owner, None, true).unwrap();
 
     let OwnerControlApplyTestServer {
@@ -421,7 +421,7 @@ async fn control_plane_api_reports_remote_endpoint_unreachable() {
     let temp = tempfile::tempdir().unwrap();
     let _home_guard = HomeEnvGuard::set(temp.path());
     let owner = OwnerKeypair::generate();
-    let keystore_path = default_keystore_path().unwrap();
+    let keystore_path = temp.path().join("owner-keystore.json");
     save_keystore(&keystore_path, &owner, None, true).unwrap();
 
     let endpoint_token = unreachable_owner_control_endpoint_token().await;
diff --git a/crates/mesh-llm-host-runtime/src/api/tests/mod.rs b/crates/mesh-llm-host-runtime/src/api/tests/mod.rs
index 229f5c8148..d3a46974a7 100644
--- a/crates/mesh-llm-host-runtime/src/api/tests/mod.rs
+++ b/crates/mesh-llm-host-runtime/src/api/tests/mod.rs
@@ -1,6 +1,6 @@
 use super::*;
 use crate::api::status::decode_runtime_model_path;
-use crate::crypto::{OwnerKeypair, default_keystore_path, save_keystore};
+use crate::crypto::{OwnerKeypair, save_keystore};
 use crate::plugin;
 use crate::plugins::blobstore;
 use base64::Engine;