1 files changed, 4 insertions, 0 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index d731e09d4e4..cbdb5bd6bcc 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -194,6 +194,10 @@ public class DeploymentSpec {
      */
     public ZoneEndpoint zoneEndpoint(InstanceName instance, ZoneId zone, ClusterSpec.Id cluster) {
         // TODO: look up endpoints from <dev> tag, or so, if we're to support non-prod settings.
+        if (   zone.environment().isTest()
+            && instances().stream()
+                          .anyMatch(spec -> spec.zoneEndpoints().getOrDefault(cluster, Map.of()).values().stream()
+                                                .anyMatch(endpoint -> ! endpoint.isPublicEndpoint()))) return ZoneEndpoint.privateEndpoint;
         if (zone.environment() != Environment.prod) return ZoneEndpoint.defaultEndpoint;
         return instance(instance).flatMap(spec -> spec.zoneEndpoint(zone, cluster))
                                  .orElse(ZoneEndpoint.defaultEndpoint);