diff --git a/apps/mcp-server/src/main.rs b/apps/mcp-server/src/main.rs
index 02019c9..60c50ac 100644
--- a/apps/mcp-server/src/main.rs
+++ b/apps/mcp-server/src/main.rs
@@ -66,11 +66,7 @@ fn database_options_from_env() -> Result<PgConnectOptions, Box<dyn std::error::E
 
 #[cfg(test)]
 mod tests {
-    use std::{
-        collections::BTreeMap,
-        env,
-        time::{Duration, SystemTime, UNIX_EPOCH},
-    };
+    use std::{collections::BTreeMap, env, time::Duration};
 
     use axum::{
         Json, Router,
@@ -1721,14 +1717,7 @@ mod tests {
             .connect(&database_url)
             .await
             .unwrap();
-        let schema = format!(
-            "test_mcp_server_{}_{}",
-            std::process::id(),
-            SystemTime::now()
-                .duration_since(UNIX_EPOCH)
-                .unwrap()
-                .as_nanos()
-        );
+        let schema = format!("test_mcp_server_{}", uuid::Uuid::now_v7().simple());
 
         admin_pool
             .execute(sqlx::query(&format!("create schema {schema}")))