diff --git a/server-rs/crates/platform-image/tests/image_provider.rs b/server-rs/crates/platform-image/tests/image_provider.rs
index cae9ed173..94df7f54e 100644
--- a/server-rs/crates/platform-image/tests/image_provider.rs
+++ b/server-rs/crates/platform-image/tests/image_provider.rs
@@ -1,10 +1,10 @@
 use platform_image::image_provider::{
-    GPT_IMAGE_2_5_GENERATION_MODEL, GPT_IMAGE_2_C_MODEL, GPT_IMAGE_2_MODEL, ImageProvider,
-    ImageProviderSettings, PlatformImageError, ReferenceImage, VECTOR_ENGINE_PROVIDER,
-    build_image_http_client, build_image_request_body, build_image_request_body_with_model,
-    build_nanobanana_generate_content_request_body, create_image_edit, create_image_generation,
-    create_nanobanana_generate_content, images_edit_url, images_generation_url,
-    nanobanana_generate_content_url,
+    GPT_IMAGE_2_5_EDIT_MODEL, GPT_IMAGE_2_5_GENERATION_MODEL, GPT_IMAGE_2_C_MODEL,
+    GPT_IMAGE_2_MODEL, ImageProvider, ImageProviderSettings, PlatformImageError, ReferenceImage,
+    VECTOR_ENGINE_PROVIDER, build_image_http_client, build_image_request_body,
+    build_image_request_body_with_model, build_nanobanana_generate_content_request_body,
+    create_image_edit, create_image_generation, create_nanobanana_generate_content,
+    images_edit_url, images_generation_url, nanobanana_generate_content_url,
 };
 use std::{
     sync::{
@@ -278,7 +278,7 @@ async fn image_edit_retries_send_timeout_once_and_succeeds() {
     assert!(
         requests
             .iter()
-            .all(|request| request.contains("\r\n\r\ngpt-image-2.5-sunburst-c\r\n"))
+            .all(|request| request.contains(&format!("\r\n\r\n{GPT_IMAGE_2_5_EDIT_MODEL}\r\n")))
     );
     server.abort();
 }
@@ -530,8 +530,8 @@ async fn image_generation_stays_on_model_after_upstream_502() {
     assert_eq!(generated.images.len(), 1);
     assert_eq!(request_count.load(Ordering::SeqCst), 2);
     let requests = requests.lock().await;
-    assert!(requests[0].contains("\"model\":\"gpt-image-2.5-flare-c\""));
-    assert!(requests[1].contains("\"model\":\"gpt-image-2.5-flare-c\""));
+    assert!(requests[0].contains(&format!("\"model\":\"{GPT_IMAGE_2_5_GENERATION_MODEL}\"")));
+    assert!(requests[1].contains(&format!("\"model\":\"{GPT_IMAGE_2_5_GENERATION_MODEL}\"")));
     server.abort();
 }
 
@@ -563,7 +563,7 @@ async fn image_generation_uses_gpt_image_2_without_fallback_on_success() {
     assert!(generated.recovered_failure_audits.is_empty());
     let requests = requests.lock().await;
     assert_eq!(requests.len(), 1);
-    assert!(requests[0].contains("\"model\":\"gpt-image-2.5-flare-c\""));
+    assert!(requests[0].contains(&format!("\"model\":\"{GPT_IMAGE_2_5_GENERATION_MODEL}\"")));
     server.abort();
 }
 
@@ -605,7 +605,7 @@ async fn image_edit_does_not_cross_model_when_unsupported() {
     assert!(matches!(error, PlatformImageError::Upstream { .. }));
     let requests = requests.lock().await;
     assert_eq!(requests.len(), 1);
-    assert!(requests[0].contains("\r\n\r\ngpt-image-2.5-sunburst-c\r\n"));
+    assert!(requests[0].contains(&format!("\r\n\r\n{GPT_IMAGE_2_5_EDIT_MODEL}\r\n")));
     server.abort();
 }
 
@@ -679,7 +679,7 @@ async fn image_generation_does_not_cross_model_after_invalid_response() {
     assert!(matches!(error, PlatformImageError::ResponseParse { .. }));
     let requests = requests.lock().await;
     assert_eq!(requests.len(), 1);
-    assert!(requests[0].contains("\"model\":\"gpt-image-2.5-flare-c\""));
+    assert!(requests[0].contains(&format!("\"model\":\"{GPT_IMAGE_2_5_GENERATION_MODEL}\"")));
     server.abort();
 }