1 files changed, 5 insertions, 8 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java
index 7f2799b6f58..f37a5a6893d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
  * @author ogronnesby
  */
 public class CloudTrialExpirerTest {
+
     private final ControllerTester tester = new ControllerTester(SystemName.PublicCd);
     private final DeploymentTester deploymentTester = new DeploymentTester(tester);
     private final CloudTrialExpirer expirer = new CloudTrialExpirer(tester.controller(), Duration.ofMinutes(5));
@@ -66,7 +67,7 @@ public class CloudTrialExpirerTest {
     @Test
     public void keep_inactive_trial_tenants_with_deployments() {
         registerTenant("with-deployments", "trial", Duration.ofDays(30));
-        registerDeployment("with-deployments", "my-app", "default", "aws-us-east-1c");
+        registerDeployment("with-deployments", "my-app", "default");
         expirer.maintain();
         assertPlan("with-deployments", "trial");
     }
@@ -78,17 +79,12 @@ public class CloudTrialExpirerTest {
         tester.controller().tenants().updateLastLogin(name, List.of(LastLoginInfo.UserLevel.user), tester.controller().clock().instant().minus(timeSinceLastLogin));
     }
 
-    private void registerDeployment(String tenantName, String appName, String instanceName, String regionName) {
-        var zone = ZoneApiMock.newBuilder()
-                .withSystem(tester.zoneRegistry().system())
-                .withId("prod." + regionName)
-                .build();
-        tester.zoneRegistry().setZones(ZoneApiMock.fromId("test.aws-us-east-1c"), ZoneApiMock.fromId("staging.aws-us-east-1c"), zone);
+    private void registerDeployment(String tenantName, String appName, String instanceName) {
         var app = tester.createApplication(tenantName, appName, instanceName);
         var ctx = deploymentTester.newDeploymentContext(tenantName, appName, instanceName);
         var pkg = new ApplicationPackageBuilder()
                 .instances("default")
-                .region(regionName)
+                .region("aws-us-east-1c")
                 .trustDefaultCertificate()
                 .build();
         ctx.submit(pkg).deploy();
@@ -97,4 +93,5 @@ public class CloudTrialExpirerTest {
     private void assertPlan(String tenant, String planId) {
         assertEquals(planId, tester.serviceRegistry().billingController().getPlan(TenantName.from(tenant)).value());
     }
+
 }