diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json
index 6c615332cb1..e446545d561 100644
--- a/scripts/test-layout/layout.json
+++ b/scripts/test-layout/layout.json
@@ -1297,46 +1297,16 @@
     "ocx-launcher-runtime.test.ts": "cli",
     "ocx-launcher-source.test.ts": "cli",
     "ocx-run.test.ts": "cli",
-    "ollama-native-parser.test.ts": "providers/ollama",
-    "ollama-native-reasoning-wire.test.ts": "providers/ollama",
-    "ollama-native-structured-output.test.ts": "providers/ollama",
-    "ollama-native-tool-continuations.test.ts": "providers/ollama",
-    "ollama-native-v4.test.ts": "providers/ollama",
-    "ollama-native.test.ts": "providers/ollama",
-    "ollama-show-enrichment-v7.test.ts": "providers/ollama",
-    "ollama-show-enrichment.test.ts": "providers/ollama",
-    "ollama-show-ignore-abort.test.ts": "providers/ollama",
-    "omo-client.test.ts": "clients",
-    "omp-path-contract.test.ts": "clients",
-    "omp-yaml-source-inline-comments.test.ts": "clients",
-    "opaque-blob-wrapped-rejection.test.ts": "responses",
-    "openai-api-virtual-models.test.ts": "adapters/openai",
-    "openai-chat-bounded-tool-names.test.ts": "adapters/openai",
-    "openai-chat-dangling-toolcalls.test.ts": "adapters/openai",
-    "openai-chat-developer-position.test.ts": "adapters/openai",
-    "openai-chat-eof.test.ts": "adapters/openai",
-    "openai-chat-hardening.test.ts": "adapters/openai",
-    "openai-chat-image-normalization.test.ts": "adapters/openai",
-    "openai-chat-inline-think-tags.test.ts": "adapters/openai",
-    "openai-chat-invalid-tool-call-diagnostics.test.ts": "adapters/openai",
-    "openai-chat-model-suffix.test.ts": "adapters/openai",
-    "openai-chat-native-policy.test.ts": "adapters/openai",
-    "openai-chat-parallel-stream.test.ts": "adapters/openai",
-    "openai-chat-path-override.test.ts": "adapters/openai",
-    "openai-chat-qwen38-leading-system.test.ts": "adapters/openai",
-    "openai-chat-reasoning-wire-policy.test.ts": "adapters/openai",
-    "openai-chat-sanitization-review-regressions.test.ts": "adapters/openai",
-    "openai-chat-serialized-tool-call-content.test.ts": "adapters/openai",
-    "openai-chat-serialized-tool-call-hold-bound.test.ts": "adapters/openai",
-    "openai-chat-serialized-tool-call-think.test.ts": "adapters/openai",
-    "openai-chat-system-order.test.ts": "adapters/openai",
-    "responses-chat-tool-call-content.test.ts": "responses",
-    "openai-chat-tool-result-images.test.ts": "adapters/openai",
-    "openai-chat-url.test.ts": "adapters/openai",
-    "openai-chat-video-part.test.ts": "adapters/openai",
-    "openai-provider-option-e2e.test.ts": "adapters/openai",
-    "openai-provider-option-migration.test.ts": "adapters/openai",
-    "openai-provider-option-startup.test.ts": "adapters/openai",
+    "ollama-native-parser.test.ts": "providers/ollama", "ollama-native-reasoning-wire.test.ts": "providers/ollama", "ollama-native-structured-output.test.ts": "providers/ollama", "ollama-native-tool-continuations.test.ts": "providers/ollama",
+    "ollama-native-v4.test.ts": "providers/ollama", "ollama-native.test.ts": "providers/ollama", "ollama-show-enrichment-v7.test.ts": "providers/ollama", "ollama-show-enrichment.test.ts": "providers/ollama",
+    "ollama-show-ignore-abort.test.ts": "providers/ollama", "omo-client.test.ts": "clients", "omp-path-contract.test.ts": "clients", "omp-yaml-source-inline-comments.test.ts": "clients",
+    "opaque-blob-wrapped-rejection.test.ts": "responses", "openai-api-virtual-models.test.ts": "adapters/openai", "openai-chat-bounded-tool-names.test.ts": "adapters/openai", "openai-chat-dangling-toolcalls.test.ts": "adapters/openai",
+    "openai-chat-developer-position.test.ts": "adapters/openai", "openai-chat-eof.test.ts": "adapters/openai", "openai-chat-hardening.test.ts": "adapters/openai", "openai-chat-image-normalization.test.ts": "adapters/openai",
+    "openai-chat-inline-think-tags.test.ts": "adapters/openai", "openai-chat-invalid-tool-call-diagnostics.test.ts": "adapters/openai", "openai-chat-model-suffix.test.ts": "adapters/openai", "openai-chat-native-policy.test.ts": "adapters/openai",
+    "openai-chat-parallel-stream.test.ts": "adapters/openai", "openai-chat-path-override.test.ts": "adapters/openai", "openai-chat-qwen38-leading-system.test.ts": "adapters/openai", "openai-chat-reasoning-wire-policy.test.ts": "adapters/openai",
+    "openai-chat-sanitization-review-regressions.test.ts": "adapters/openai", "openai-chat-serialized-tool-call-content.test.ts": "adapters/openai", "openai-chat-serialized-tool-call-hold-bound.test.ts": "adapters/openai", "openai-chat-serialized-tool-call-think.test.ts": "adapters/openai",
+    "openai-chat-system-order.test.ts": "adapters/openai", "responses-chat-tool-call-content.test.ts": "responses", "openai-chat-tool-result-images.test.ts": "adapters/openai", "openai-chat-url.test.ts": "adapters/openai",
+    "openai-chat-video-part.test.ts": "adapters/openai", "openai-provider-option-e2e.test.ts": "adapters/openai", "openai-provider-option-migration.test.ts": "adapters/openai", "openai-provider-option-startup.test.ts": "adapters/openai",
     "openai-provider-option-tooling.test.ts": "adapters/openai",
     "openai-provider-option.test.ts": "adapters/openai",
     "responses-forward-client-headers.test.ts": "responses",