diff --git a/tests/unit/auto-combo-credentialed-model-pool.test.ts b/tests/unit/auto-combo-credentialed-model-pool.test.ts
index 1515b6a9b9..2035fa03f7 100644
--- a/tests/unit/auto-combo-credentialed-model-pool.test.ts
+++ b/tests/unit/auto-combo-credentialed-model-pool.test.ts
@@ -86,10 +86,10 @@ test("credentialed providers expose one logical candidate per visible registry m
     "provider/model candidates must not be duplicated per connection"
   );
   for (const model of [
-    "antigravity/claude-sonnet-5",
-    "antigravity/gemini-3.5-flash-low",
-    "antigravity/gemini-3.5-flash-medium",
-    "antigravity/gemini-3.5-flash-high",
+    "antigravity/claude-sonnet-4-6",
+    "antigravity/gemini-3.6-flash-low",
+    "antigravity/gemini-3.6-flash-medium",
+    "antigravity/gemini-3.6-flash-high",
   ]) {
     assert.ok(modelStrings.includes(model), `${model} should be eligible for auto routing`);
   }
@@ -110,7 +110,7 @@ test("candidate transparency expands a logical model into per-account rows", asy
   const result = await candidateHandler.getAutoComboCandidates("auto", null);
   const sonnetRows = result.candidates.filter(
     (candidate) =>
-      candidate.provider === "antigravity" && candidate.model === "antigravity/claude-sonnet-5"
+      candidate.provider === "antigravity" && candidate.model === "antigravity/claude-sonnet-4-6"
   );
 
   assert.deepEqual(
@@ -121,12 +121,12 @@ test("candidate transparency expands a logical model into per-account rows", asy
 });
 
 test("connection model exclusions narrow only that model's account allowlist", async () => {
-  const { first, second } = await seedConnections(["gemini-3.5-*"]);
+  const { first, second } = await seedConnections(["gemini-3.6-*"]);
 
   const combo = await virtualFactory.createVirtualAutoCombo(undefined);
   const candidates = antigravityCandidates(combo);
   const geminiCandidates = candidates.filter((candidate) =>
-    candidate.model.startsWith("antigravity/gemini-3.5-")
+    candidate.model.startsWith("antigravity/gemini-3.6-")
   );
 
   assert.ok(geminiCandidates.length >= 3, "Gemini 3.5 candidates should remain available");
@@ -134,23 +134,25 @@ test("connection model exclusions narrow only that model's account allowlist", a
     assert.deepEqual(candidate.allowedConnectionIds, [second.id]);
   }
 
-  const sonnet = candidates.find((candidate) => candidate.model === "antigravity/claude-sonnet-5");
+  const sonnet = candidates.find(
+    (candidate) => candidate.model === "antigravity/claude-sonnet-4-6"
+  );
   assert.ok(sonnet, "Claude Sonnet 5 should remain in the candidate pool");
   assert.deepEqual([...(sonnet.allowedConnectionIds ?? [])].sort(), [first.id, second.id].sort());
 });
 
 test("hiding the first registry model does not drop the credentialed provider", async () => {
   await seedConnections();
-  modelsDb.setModelIsHidden("antigravity", "claude-sonnet-5", true);
+  modelsDb.setModelIsHidden("antigravity", "claude-sonnet-4-6", true);
 
   const combo = await virtualFactory.createVirtualAutoCombo(undefined);
   const modelStrings = antigravityCandidates(combo).map((candidate) => candidate.model);
 
-  assert.equal(modelStrings.includes("antigravity/claude-sonnet-5"), false);
+  assert.equal(modelStrings.includes("antigravity/claude-sonnet-4-6"), false);
   for (const model of [
-    "antigravity/gemini-3.5-flash-low",
-    "antigravity/gemini-3.5-flash-medium",
-    "antigravity/gemini-3.5-flash-high",
+    "antigravity/gemini-3.6-flash-low",
+    "antigravity/gemini-3.6-flash-medium",
+    "antigravity/gemini-3.6-flash-high",
   ]) {
     assert.ok(modelStrings.includes(model), `${model} should remain after Sonnet is hidden`);
   }
diff --git a/tests/unit/t31-t33-t34-t38-model-specs.test.ts b/tests/unit/t31-t33-t34-t38-model-specs.test.ts
index c27b301f68..38bb56802b 100644
--- a/tests/unit/t31-t33-t34-t38-model-specs.test.ts
+++ b/tests/unit/t31-t33-t34-t38-model-specs.test.ts
@@ -16,10 +16,13 @@ const {
 } = await import("../../src/shared/constants/modelSpecs.ts");
 
 test("T31: antigravity static catalog exposes client-visible Gemini preview IDs", () => {
-  // Antigravity exposes preview aliases to clients even though the upstream
-  // still accepts its internal model identifiers.
+  // Antigravity exposes client-visible Gemini IDs even though the upstream still
+  // accepts its internal model identifiers. #8013 (align official clients / callable
+  // catalog) retired the `gemini-3-pro-preview` alias, so assert the current
+  // client-visible top flash tier instead.
   const staticIds = (getStaticModelsForProvider("antigravity") || []).map((m) => m.id);
-  assert.ok(staticIds.includes("gemini-3-pro-preview"));
+  assert.ok(staticIds.includes("gemini-3.6-flash-high"));
+  assert.ok(!staticIds.includes("gemini-3-pro-preview"));
   // #3303 (agy parity, discussion #3184): the Gemini + Claude budget tiers ARE
   // client-visible on the Antigravity OAuth backend (Claude was never removed).
   assert.ok(staticIds.includes("gemini-3.1-pro-low"));