1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
index e6a9014df94..63d479d4c6c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
@@ -161,7 +161,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
 
     @Override
     public ZoneApi systemZone() {
-        return ZoneApiMock.fromId("prod.controller");
+        return ZoneApiMock.newBuilder().withSystem(system).withVirtualId(ZoneId.ofVirtualControllerZone()).build();
     }
 
     @Override
@@ -180,7 +180,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     private ZoneApiMock systemAsZone() {
         return ZoneApiMock.newBuilder()
                           .with(ZoneId.from("prod.us-east-1"))
-                          .withVirtualId(ZoneId.from("prod.controller"))
+                          .withVirtualId(ZoneId.ofVirtualControllerZone())
                           .build();
     }