Keep time outside ValidationOverrides

31 files changed, 282 insertions, 196 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 5d74760ca9a..61458d871ac 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -207,7 +207,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     private Application getApplication(Tenant tenant, ApplicationId applicationId) {
         long sessionId = getSessionIdForApplication(tenant, applicationId);
         RemoteSession session = tenant.getRemoteSessionRepo().getSession(sessionId, 0);
-        return session.ensureApplicationLoaded().getForVersionOrLatest(Optional.empty());
+        return session.ensureApplicationLoaded().getForVersionOrLatest(Optional.empty(), clock.instant());
     }
 
     public long getSessionIdForApplication(Tenant tenant, ApplicationId applicationId) {
@@ -307,7 +307,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         LocalSession session = getLocalSession(tenant, sessionId);
         ApplicationId appId = params.getApplicationId();
         Optional<ApplicationSet> currentActiveApplicationSet = getCurrentActiveApplicationSet(tenant, appId);
-        return session.prepare(logger, params, currentActiveApplicationSet, tenant.getPath());
+        return session.prepare(logger, params, currentActiveApplicationSet, tenant.getPath(), clock.instant());
     }
 
     private List<ApplicationId> listApplicationIds(Tenant tenant) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java
index 6b9c82a04ee..105bd9a5b2a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelRequestHandler.java
@@ -22,6 +22,7 @@ import com.yahoo.vespa.config.server.rpc.ConfigResponseFactory;
 import com.yahoo.vespa.config.server.rpc.ConfigResponseFactoryFactory;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -74,7 +75,7 @@ public class SuperModelRequestHandler implements RequestHandler {
             newModels.put(tenant, new LinkedHashMap<>());
         }
         // TODO: Should supermodel care about multiple versions?
-        newModels.get(tenant).put(applicationSet.getId(), applicationSet.getForVersionOrLatest(Optional.empty()));
+        newModels.get(tenant).put(applicationSet.getId(), applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()));
         handler = createNewHandler(newModels);
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
index 019a8123648..459bee99d75 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.config.server.application;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Version;
 
+import java.time.Instant;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -48,19 +49,19 @@ public final class ApplicationMapper {
      *
      * @return the matching application, or null if none matches
      */
-    public Application getForVersion(ApplicationId applicationId, Optional<Version> vespaVersion) throws VersionDoesNotExistException {
-        return getApplicationSet(applicationId).getForVersionOrLatest(vespaVersion);
+    public Application getForVersion(ApplicationId applicationId, Optional<Version> vespaVersion, Instant now) throws VersionDoesNotExistException {
+        return getApplicationSet(applicationId).getForVersionOrLatest(vespaVersion, now);
     }
 
     /** Returns whether this registry has an application for the given application id */
-    public boolean hasApplication(ApplicationId applicationId) {
-        return hasApplicationForVersion(applicationId, Optional.<Version>empty());
+    public boolean hasApplication(ApplicationId applicationId, Instant now) {
+        return hasApplicationForVersion(applicationId, Optional.<Version>empty(), now);
     }
 
     /** Returns whether this registry has an application for the given application id and vespa version */
-    public boolean hasApplicationForVersion(ApplicationId applicationId, Optional<Version> vespaVersion) {
+    public boolean hasApplicationForVersion(ApplicationId applicationId, Optional<Version> vespaVersion, Instant now) {
         try {
-            return getForVersion(applicationId, vespaVersion) != null;
+            return getForVersion(applicationId, vespaVersion, now) != null;
         }
         catch (VersionDoesNotExistException | NotFoundException ex) {
             return false;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
index 6d6ed925ebd..7d46152dd4d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
@@ -4,6 +4,7 @@ import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Version;
 
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -32,18 +33,18 @@ public final class ApplicationSet {
         latestVersion = applications.keySet().stream().max((a, b) -> a.compareTo(b)).get();
     }
 
-    public Application getForVersionOrLatest(Optional<Version> optionalVersion) {
-        return resolveForVersion(optionalVersion.orElse(latestVersion));
+    public Application getForVersionOrLatest(Optional<Version> optionalVersion, Instant now) {
+        return resolveForVersion(optionalVersion.orElse(latestVersion), now);
     }
 
-    private Application resolveForVersion(Version vespaVersion) {
+    private Application resolveForVersion(Version vespaVersion, Instant now) {
         Application application = applications.get(vespaVersion);
         if (application != null)
             return application;
 
         // Does the latest version specify we can use it regardless?
         Application latest = applications.get(latestVersion);
-        if (latest.getModel().allowModelVersionMismatch())
+        if (latest.getModel().allowModelVersionMismatch(now))
             return latest;
 
         throw new VersionDoesNotExistException(String.format("No application with vespa version %s exists", vespaVersion.toString()));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index b04b00b8223..61382af6a30 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -110,7 +110,8 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
                                                    .vespaVersion(version.toString())
                                                    .build(),
                         Optional.empty(),
-                        tenantPath);
+                        tenantPath,
+                        clock.instant());
         this.prepared = true;
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index a4a98dd3431..a805d335c2e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -30,6 +30,7 @@ import com.yahoo.vespa.config.server.session.SessionZooKeeperClient;
 import com.yahoo.vespa.config.server.session.SilentDeployLogger;
 import com.yahoo.vespa.curator.Curator;
 
+import java.time.Instant;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Logger;
@@ -71,8 +72,11 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     }
 
     @Override
-    protected Application buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage,
-                                            ApplicationId applicationId, com.yahoo.component.Version wantedNodeVespaVersion) {
+    protected Application buildModelVersion(ModelFactory modelFactory, 
+                                            ApplicationPackage applicationPackage,
+                                            ApplicationId applicationId, 
+                                            com.yahoo.component.Version wantedNodeVespaVersion,
+                                            Instant now) {
         log.log(LogLevel.DEBUG, String.format("Loading model version %s for session %s application %s",
                                               modelFactory.getVersion(), appGeneration, applicationId));
         ServerCache cache = zkClient.loadServerCache();
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 0faee6a4eb7..509a26370ff 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -14,6 +14,7 @@ import com.yahoo.vespa.config.server.ConfigServerSpec;
 import com.yahoo.vespa.config.server.deploy.ModelContextImpl;
 import com.yahoo.vespa.config.server.http.UnknownVespaVersionException;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -42,7 +43,9 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
     }
 
     public List<MODELRESULT> buildModels(ApplicationId applicationId, 
-                                         com.yahoo.component.Version wantedNodeVespaVersion, ApplicationPackage applicationPackage) {
+                                         com.yahoo.component.Version wantedNodeVespaVersion, 
+                                         ApplicationPackage applicationPackage,
+                                         Instant now) {
         Set<Version> versions = modelFactoryRegistry.allVersions();
 
         // If the application specifies a major, load models only for that
@@ -63,10 +66,10 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
         for (int i = 0; i < majorVersions.size(); i++) {
             try {
                 allApplicationModels.addAll(buildModelVersion(filterByMajorVersion(majorVersions.get(i), versions),
-                                                              applicationId, wantedNodeVespaVersion, applicationPackage));
+                                                              applicationId, wantedNodeVespaVersion, applicationPackage, now));
 
                 // skip old config models if requested after we have found a major version which works
-                if (allApplicationModels.size() > 0 && allApplicationModels.get(0).getModel().skipOldConfigModels())
+                if (allApplicationModels.size() > 0 && allApplicationModels.get(0).getModel().skipOldConfigModels(now))
                     break;
             }
             catch (OutOfCapacityException e) {
@@ -88,11 +91,16 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
 
     private List<MODELRESULT> buildModelVersion(Set<Version> versions, ApplicationId applicationId,
                                                 com.yahoo.component.Version wantedNodeVespaVersion, 
-                                                ApplicationPackage applicationPackage) {
+                                                ApplicationPackage applicationPackage,
+                                                Instant now) {
         Version latest = findLatest(versions);
         // load latest application version
-        MODELRESULT latestApplicationVersion = buildModelVersion(modelFactoryRegistry.getFactory(latest), applicationPackage, applicationId, wantedNodeVespaVersion);
-        if (latestApplicationVersion.getModel().skipOldConfigModels()) {
+        MODELRESULT latestApplicationVersion = buildModelVersion(modelFactoryRegistry.getFactory(latest), 
+                                                                 applicationPackage, 
+                                                                 applicationId, 
+                                                                 wantedNodeVespaVersion, 
+                                                                 now);
+        if (latestApplicationVersion.getModel().skipOldConfigModels(now)) {
             return Collections.singletonList(latestApplicationVersion);
         }
         else { // load old model versions
@@ -100,7 +108,11 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
             allApplicationVersions.add(latestApplicationVersion);
             for (Version version : versions) {
                 if (version.equals(latest)) continue; // already loaded
-                allApplicationVersions.add(buildModelVersion(modelFactoryRegistry.getFactory(version), applicationPackage, applicationId, wantedNodeVespaVersion));
+                allApplicationVersions.add(buildModelVersion(modelFactoryRegistry.getFactory(version), 
+                                                             applicationPackage, 
+                                                             applicationId, 
+                                                             wantedNodeVespaVersion, 
+                                                             now));
             }
             return allApplicationVersions;
         }
@@ -121,7 +133,8 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
 
     protected abstract MODELRESULT buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage,
                                                      ApplicationId applicationId, 
-                                                     com.yahoo.component.Version wantedNodeVespaVersion);
+                                                     com.yahoo.component.Version wantedNodeVespaVersion,
+                                                     Instant now);
 
     protected ModelContext.Properties createModelContextProperties(ApplicationId applicationId,
                                                                    ConfigserverConfig configserverConfig,
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index 4e87de70759..98741c631b1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -28,6 +28,7 @@ import com.yahoo.vespa.config.server.session.SessionContext;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Logger;
@@ -79,7 +80,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
     protected PreparedModelResult buildModelVersion(ModelFactory modelFactory, 
                                                     ApplicationPackage applicationPackage,
                                                     ApplicationId applicationId, 
-                                                    com.yahoo.component.Version wantedNodeVespaVersion) {
+                                                    com.yahoo.component.Version wantedNodeVespaVersion, Instant now) {
         Version modelVersion = modelFactory.getVersion();
         log.log(LogLevel.DEBUG, "Start building model for Vespa version " + modelVersion);
         FileDistributionProvider fileDistributionProvider = fileDistributionFactory.createProvider(
@@ -88,7 +89,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
 
         Optional<HostProvisioner> hostProvisioner = createHostProvisionerAdapter(properties);
         Optional<Model> previousModel = currentActiveApplicationSet
-                .map(set -> set.getForVersionOrLatest(Optional.of(modelVersion)).getModel());
+                .map(set -> set.getForVersionOrLatest(Optional.of(modelVersion), now).getModel());
         ModelContext modelContext = new ModelContextImpl(
                 applicationPackage,
                 previousModel,
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
index baa4dc2ca79..a222182f87a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
@@ -22,6 +22,7 @@ import com.yahoo.vespa.config.server.tenant.Tenants;
 import com.yahoo.vespa.curator.Curator;
 
 import java.io.File;
+import java.time.Instant;
 import java.util.Optional;
 
 /**
@@ -62,10 +63,11 @@ public class LocalSession extends Session implements Comparable<LocalSession> {
     public ConfigChangeActions prepare(DeployLogger logger, 
                                        PrepareParams params, 
                                        Optional<ApplicationSet> currentActiveApplicationSet, 
-                                       Path tenantPath) {
+                                       Path tenantPath,
+                                       Instant now) {
         Curator.CompletionWaiter waiter = zooKeeperClient.createPrepareWaiter();
-        ConfigChangeActions actions = sessionPreparer.prepare(sessionContext, logger, params, 
-                                                              currentActiveApplicationSet, tenantPath);
+        ConfigChangeActions actions = sessionPreparer.prepare(sessionContext, logger, params,
+                                                              currentActiveApplicationSet, tenantPath, now);
         setPrepared();
         waiter.awaitCompletion(params.getTimeoutBudget().timeLeft());
         return actions;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index df0a407c408..c20f6e0b853 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -10,6 +10,8 @@ import com.yahoo.vespa.config.server.tenant.Tenants;
 import com.yahoo.vespa.curator.Curator;
 import org.apache.zookeeper.KeeperException;
 
+import java.time.Clock;
+import java.time.Instant;
 import java.util.*;
 import java.util.logging.Logger;
 
@@ -25,6 +27,7 @@ public class RemoteSession extends Session {
     private static final Logger log = Logger.getLogger(RemoteSession.class.getName());
     private volatile ApplicationSet applicationSet = null;
     private final ActivatedModelsBuilder applicationLoader;
+    private final Clock clock;
 
     /**
      * Creates a session. This involves loading the application, validating it and distributing it.
@@ -37,9 +40,11 @@ public class RemoteSession extends Session {
     public RemoteSession(TenantName tenant,
                          long sessionId,
                          GlobalComponentRegistry globalComponentRegistry,
-                         SessionZooKeeperClient zooKeeperClient) {
+                         SessionZooKeeperClient zooKeeperClient,
+                         Clock clock) {
         super(tenant, sessionId, zooKeeperClient);
         this.applicationLoader = new ActivatedModelsBuilder(tenant, sessionId, zooKeeperClient, globalComponentRegistry);
+        this.clock = clock;
     }
 
     public void loadPrepared() {
@@ -51,7 +56,8 @@ public class RemoteSession extends Session {
     private ApplicationSet loadApplication() {
         return ApplicationSet.fromList(applicationLoader.buildModels(zooKeeperClient.readApplicationId(),
                                                                      zooKeeperClient.readVespaVersion(),
-                                                                     zooKeeperClient.loadApplicationPackage()));
+                                                                     zooKeeperClient.loadApplicationPackage(),
+                                                                     clock.instant()));
     }
 
     public ApplicationSet ensureApplicationLoaded() {
@@ -83,7 +89,7 @@ public class RemoteSession extends Session {
     @Override
     public String logPre() {
         if (applicationSet != null) {
-            return Tenants.logPre(applicationSet.getForVersionOrLatest(Optional.empty()).getId());
+            return Tenants.logPre(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getId());
         }
 
         return Tenants.logPre(getTenant());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java
index e4e368716ee..0f1e65aaf2b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java
@@ -9,6 +9,8 @@ import com.yahoo.vespa.config.server.GlobalComponentRegistry;
 import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
 import com.yahoo.vespa.curator.Curator;
 
+import java.time.Clock;
+
 /**
  * @author lulf
  * @since 5.1.24
@@ -22,10 +24,12 @@ public class RemoteSessionFactory {
     private final ConfigDefinitionRepo defRepo;
     private final TenantName tenant;
     private final ConfigserverConfig configserverConfig;
+    private final Clock clock;
 
     public RemoteSessionFactory(GlobalComponentRegistry componentRegistry,
                                 Path sessionsPath,
-                                TenantName tenant) {
+                                TenantName tenant,
+                                Clock clock) {
         this.componentRegistry = componentRegistry;
         this.curator = componentRegistry.getCurator();
         this.configCurator = componentRegistry.getConfigCurator();
@@ -33,6 +37,7 @@ public class RemoteSessionFactory {
         this.tenant = tenant;
         this.defRepo = componentRegistry.getConfigDefinitionRepo();
         this.configserverConfig = componentRegistry.getConfigserverConfig();
+        this.clock = clock;
     }
 
     public RemoteSession createSession(long sessionId) {
@@ -43,7 +48,7 @@ public class RemoteSessionFactory {
                                                                             defRepo,
                                                                             configserverConfig.serverId(),
                                                                             componentRegistry.getZone().nodeFlavors());
-        return new RemoteSession(tenant, sessionId, componentRegistry, sessionZKClient);
+        return new RemoteSession(tenant, sessionId, componentRegistry, sessionZKClient, clock);
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 23c3b4bf8c4..0b76c57e142 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -28,6 +28,7 @@ import com.yahoo.vespa.curator.Curator;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -86,11 +87,12 @@ public class SessionPreparer {
      * @return the config change actions that must be done to handle the activation of the models prepared.
      */
     public ConfigChangeActions prepare(SessionContext context, DeployLogger logger, PrepareParams params,
-                                       Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath) {
+                                       Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath, 
+                                       Instant now) {
         Preparation preparation = new Preparation(context, logger, params, currentActiveApplicationSet, tenantPath);
         preparation.preprocess();
         try {
-            preparation.buildModels();
+            preparation.buildModels(now);
             preparation.makeResult();
             if ( ! params.isDryRun()) {
                 preparation.writeStateZK();
@@ -175,8 +177,8 @@ public class SessionPreparer {
             checkTimeout("preprocess");
         }
 
-        void buildModels() {
-            this.modelResultList = preparedModelsBuilder.buildModels(applicationId, vespaVersion, applicationPackage);
+        void buildModels(Instant now) {
+            this.modelResultList = preparedModelsBuilder.buildModels(applicationId, vespaVersion, applicationPackage, now);
             checkTimeout("build models");
         }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
index 075888168e2..144bbf10dc6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
@@ -31,6 +31,7 @@ import java.util.concurrent.Executors;
  * @since 5.1
  */
 public class TenantBuilder {
+
     private final Path tenantPath;
     private final GlobalComponentRegistry componentRegistry;
     private final TenantName tenant;
@@ -46,6 +47,7 @@ public class TenantBuilder {
     private RemoteSessionFactory remoteSessionFactory;
     private TenantFileSystemDirs tenantFileSystemDirs;
     private HostValidator<ApplicationId> hostValidator;
+    private Clock clock = Clock.systemUTC();
 
     private TenantBuilder(GlobalComponentRegistry componentRegistry, TenantName tenant, Path zkPath) {
         this.componentRegistry = componentRegistry;
@@ -88,6 +90,11 @@ public class TenantBuilder {
         return this;
     }
 
+    public TenantBuilder withClock(Clock clock) {
+        this.clock = clock;
+        return this;
+    }
+
     /**
      * Create a real tenant from the properties given by this builder.
      *
@@ -97,7 +104,7 @@ public class TenantBuilder {
     public Tenant build() throws Exception {
         createTenantRequestHandler();
         createApplicationRepo();
-        createRemoteSessionFactory();
+        createRemoteSessionFactory(clock);
         createRemoteSessionRepo();
         createSessionCounter();
         createServerDbDirs();
@@ -164,12 +171,9 @@ public class TenantBuilder {
         }
     }
 
-    private void createRemoteSessionFactory() {
+    private void createRemoteSessionFactory(Clock clock) {
         if (remoteSessionFactory == null) {
-            remoteSessionFactory = new RemoteSessionFactory(
-                    componentRegistry,
-                    sessionsPath,
-                    tenant);
+            remoteSessionFactory = new RemoteSessionFactory(componentRegistry, sessionsPath, tenant, clock);
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
index bc9ff9b79be..20d1e88440f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.tenant;
 
+import java.time.Clock;
+import java.time.Instant;
 import java.util.*;
 
 import com.yahoo.config.provision.Version;
@@ -43,6 +45,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
     private final HostRegistry<ApplicationId> hostRegistry;
     private final ApplicationMapper applicationMapper = new ApplicationMapper();
     private final MetricUpdater tenantMetricUpdater;
+    private final Clock clock = Clock.systemUTC();
 
     public TenantRequestHandler(Metrics metrics,
                                 TenantName tenant,
@@ -93,7 +96,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
 
     @Override
     public void removeApplication(ApplicationId applicationId) {
-        if (applicationMapper.hasApplication(applicationId)) {
+        if (applicationMapper.hasApplication(applicationId, clock.instant())) {
             applicationMapper.remove(applicationId);
             hostRegistry.removeHostsForKey(applicationId);
             reloadListenersOnRemove(applicationId);
@@ -182,7 +185,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
 
     private Application getApplication(ApplicationId appId, Optional<Version> vespaVersion) {
         try {
-            return applicationMapper.getForVersion(appId, vespaVersion);
+            return applicationMapper.getForVersion(appId, vespaVersion, clock.instant());
         } catch (VersionDoesNotExistException ex) {
             throw new NotFoundException(String.format("%sNo such application (id %s): %s", Tenants.logPre(tenant), appId, ex.getMessage()));
         }
@@ -200,7 +203,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
     }
 
     private boolean hasHandler(ApplicationId appId, Optional<Version> vespaVersion) {
-        return applicationMapper.hasApplicationForVersion(appId, vespaVersion);
+        return applicationMapper.hasApplicationForVersion(appId, vespaVersion, clock.instant());
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
index 8748db808b3..a83f2676a4d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationMapperTest.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.application;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;
@@ -16,6 +17,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 public class ApplicationMapperTest {
+
     ApplicationId appId;
     ApplicationMapper applicationMapper;
     ArrayList<Version> vespaVersions = new ArrayList<>();
@@ -37,22 +39,22 @@ public class ApplicationMapperTest {
     @Test
     public void testGetForVersionReturnsCorrectVersion() {
         applicationMapper.register(appId, ApplicationSet.fromList(applications));
-        assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(0))), applications.get(0));
-        assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1))), applications.get(1));
-        assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(2))), applications.get(2));
+        assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
+        assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
+        assertEquals(applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
     }
 
     @Test
     public void testGetForVersionReturnsLatestVersion() {
         applicationMapper.register(appId, ApplicationSet.fromList(applications));
-        assertEquals(applicationMapper.getForVersion(appId, Optional.empty()), applications.get(2));
+        assertEquals(applicationMapper.getForVersion(appId, Optional.empty(), Instant.now()), applications.get(2));
     }
 
     @Test (expected = VersionDoesNotExistException.class)
     public void testGetForVersionThrows() {
         applicationMapper.register(appId, ApplicationSet.fromList(Arrays.asList(applications.get(0), applications.get(2))));
 
-        applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)));
+        applicationMapper.getForVersion(appId, Optional.of(vespaVersions.get(1)), Instant.now());
     }
 
     @Test (expected = NotFoundException.class)
@@ -61,6 +63,7 @@ public class ApplicationMapperTest {
 
         applicationMapper.getForVersion(new ApplicationId.Builder()
                                         .tenant("different").applicationName("different").instanceName("different").build(),
-                                        Optional.of(vespaVersions.get(1)));
+                                        Optional.of(vespaVersions.get(1)),
+                                        Instant.now());
     }
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java
index 8d54ee6b530..98bedb76599 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationSetTest.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.application;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,21 +37,21 @@ public class ApplicationSetTest {
     @Test
     public void testGetForVersionOrLatestReturnsCorrectVersion() {
         applicationSet = ApplicationSet.fromList(applications);
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(0))), applications.get(0));
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1))), applications.get(1));
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(2))), applications.get(2));
+        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(0)), Instant.now()), applications.get(0));
+        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now()), applications.get(1));
+        assertEquals(applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(2)), Instant.now()), applications.get(2));
     }
 
     @Test
     public void testGetForVersionOrLatestReturnsLatestVersion() {
         applicationSet = ApplicationSet.fromList(applications);
-        assertEquals(applicationSet.getForVersionOrLatest(Optional.empty()), applications.get(2));
+        assertEquals(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()), applications.get(2));
     }
 
     @Test (expected = VersionDoesNotExistException.class)
     public void testGetForVersionOrLatestThrows() {
         applicationSet = ApplicationSet.fromList(Arrays.asList(applications.get(0), applications.get(2)));
-        applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)));
+        applicationSet.getForVersionOrLatest(Optional.of(vespaVersions.get(1)), Instant.now());
     }
 
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 861cbe467ae..c9556425dda 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -108,14 +108,14 @@ public class DeployTester {
     /**
      * Do the initial "deploy" with the existing API-less code as the deploy API doesn't support first deploys yet.
      */
-    public ApplicationId deployApp(String appName) {
-        return deployApp(appName, Optional.empty());
+    public ApplicationId deployApp(String appName, Instant now) {
+        return deployApp(appName, Optional.empty(), now);
     }
 
     /**
      * Do the initial "deploy" with the existing API-less code as the deploy API doesn't support first deploys yet.
      */
-    public ApplicationId deployApp(String appName, Optional<String> vespaVersion)  {
+    public ApplicationId deployApp(String appName, Optional<String> vespaVersion, Instant now)  {
         Tenant tenant = tenant();
         LocalSession session = tenant.getSessionFactory().createSession(testApp, appName, new TimeoutBudget(Clock.systemUTC(), Duration.ofSeconds(60)));
         ApplicationId id = ApplicationId.from(tenant.getName(), ApplicationName.from(appName), InstanceName.defaultName());
@@ -126,7 +126,8 @@ public class DeployTester {
         session.prepare(new SilentDeployLogger(),
                         paramsBuilder.build(),
                         Optional.empty(),
-                        tenant.getPath());
+                        tenant.getPath(),
+                        now);
         session.createActivateTransaction().commit();
         tenant.getLocalSessionRepo().addSession(session);
         this.id = id;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
index e5d8d1b7b94..31e92cc9f93 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
@@ -12,6 +12,7 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -31,7 +32,7 @@ public class HostedDeployTest {
     @Test
     public void testRedeployWithVersion() throws InterruptedException, IOException {
         DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
-        tester.deployApp("myApp", Optional.of("4.5.6"));
+        tester.deployApp("myApp", Optional.of("4.5.6"), Instant.now());
 
         Optional<com.yahoo.config.provision.Deployment> deployment = tester.redeployFromLocalActive();
         assertTrue(deployment.isPresent());
@@ -43,7 +44,7 @@ public class HostedDeployTest {
     @Test
     public void testRedeploy() throws InterruptedException, IOException {
         DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
-        tester.deployApp("myApp");
+        tester.deployApp("myApp", Instant.now());
 
         Optional<com.yahoo.config.provision.Deployment> deployment = tester.redeployFromLocalActive();
         assertTrue(deployment.isPresent());
@@ -59,7 +60,7 @@ public class HostedDeployTest {
         modelFactories.add(DeployTester.createDefaultModelFactory(clock));
         modelFactories.add(DeployTester.createFailingModelFactory(Version.fromIntValues(1, 0, 0))); // older than default
         DeployTester tester = new DeployTester("src/test/apps/validationOverride/", modelFactories, createConfigserverConfig());
-        tester.deployApp("myApp");
+        tester.deployApp("myApp", clock.instant());
 
         // Redeployment from local active works
         {
@@ -82,7 +83,7 @@ public class HostedDeployTest {
         // However, redeployment from the outside fails after this date
         {
             try {
-                tester.deployApp("myApp");
+                tester.deployApp("myApp", Instant.now());
                 fail("Expected redeployment to fail");
             }
             catch (Exception expected) {
@@ -96,7 +97,7 @@ public class HostedDeployTest {
     public void testDeployWithDockerImage() throws InterruptedException, IOException {
         final String vespaVersion = "6.51.1";
         DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
-        ApplicationId applicationId = tester.deployApp("myApp", Optional.of(vespaVersion));
+        ApplicationId applicationId = tester.deployApp("myApp", Optional.of(vespaVersion), Instant.now());
         assertProvisionInfo(vespaVersion, tester, applicationId);
 
         System.out.println("Redeploy");
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/RedeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/RedeployTest.java
index b3dc14a1178..5658e0fb2aa 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/RedeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/RedeployTest.java
@@ -11,6 +11,7 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.time.Clock;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -29,7 +30,7 @@ public class RedeployTest {
     @Test
     public void testRedeploy() throws InterruptedException, IOException {
         DeployTester tester = new DeployTester("src/test/apps/app");
-        tester.deployApp("myapp");
+        tester.deployApp("myapp", Instant.now());
         Optional<com.yahoo.config.provision.Deployment> deployment = tester.redeployFromLocalActive();
 
         assertTrue(deployment.isPresent());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java
index 1f181e74b73..eef0058e13e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionActiveHandlerTestBase.java
@@ -10,6 +10,7 @@ import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Clock;
 import java.util.Collections;
 import java.util.Optional;
 
@@ -17,6 +18,7 @@ import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.*;
+import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry;
 import com.yahoo.vespa.config.server.SuperModelGenerationCounter;
 import com.yahoo.vespa.config.server.TestComponentRegistry;
@@ -56,15 +58,17 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
 
     @Test
     public void testThatPreviousSessionIsDeactivated() throws Exception {
-        RemoteSession firstSession = activateAndAssertOK(90l, 0l);
-        activateAndAssertOK(91l, 90l);
+        Clock clock = Clock.systemUTC();
+        RemoteSession firstSession = activateAndAssertOK(90l, 0l, clock);
+        activateAndAssertOK(91l, 90l, clock);
         assertThat(firstSession.getStatus(), is(Session.Status.DEACTIVATE));
     }
     
     @Test
     public void testForceActivationWithActivationInBetween() throws Exception {
-        activateAndAssertOK(90l, 0l);
-        activateAndAssertOK(92l, 89l, "?force=true");
+        Clock clock = Clock.systemUTC();
+        activateAndAssertOK(90l, 0l, clock);
+        activateAndAssertOK(92l, 89l, "?force=true", clock);
     }
 
     @Test
@@ -75,8 +79,9 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
     
     @Test
     public void testActivationWithActivationInBetween() throws Exception {
-        activateAndAssertOK(90l, 0l);
-        activateAndAssertError(92l, 89l,
+        Clock clock = Clock.systemUTC();
+        activateAndAssertOK(90l, 0l, clock);
+        activateAndAssertError(92l, 89l, clock,
                 HttpErrorResponse.errorCodes.BAD_REQUEST,
                 getActivateLogPre() +
                 "Cannot activate session 92 because the currently active session (90) has changed since session 92 was created (was 89 at creation time)");
@@ -87,9 +92,9 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
     @Test
     public void testActivationOfUnpreparedSession() throws Exception {
         // Needed so we can test that previous active session is still active after a failed activation
-        RemoteSession firstSession = activateAndAssertOK(90l, 0l);
+        RemoteSession firstSession = activateAndAssertOK(90l, 0l, Clock.systemUTC());
         long sessionId = 91l;
-        ActivateRequest activateRequest = new ActivateRequest(sessionId, 0l, Session.Status.NEW, "").invoke();
+        ActivateRequest activateRequest = new ActivateRequest(sessionId, 0l, Session.Status.NEW, "", Clock.systemUTC()).invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         RemoteSession session = activateRequest.getSession();
         assertThat(actResponse.getStatus(), is(BAD_REQUEST));
@@ -101,16 +106,16 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
     @Test
     public void testActivationWithBarrierTimeout() throws Exception {
         // Needed so we can test that previous active session is still active after a failed activation
-        activateAndAssertOK(90l, 0l);
+        activateAndAssertOK(90l, 0l, Clock.systemUTC());
         ((MockCurator) curator).timeoutBarrierOnEnter(true);
-        ActivateRequest activateRequest = new ActivateRequest(91l, 90l, "").invoke();
+        ActivateRequest activateRequest = new ActivateRequest(91l, 90l, "", Clock.systemUTC()).invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         assertThat(actResponse.getStatus(), is(INTERNAL_SERVER_ERROR));
     }
 
     @Test
     public void testActivationOfSessionThatDoesNotExistAsLocalSession() throws Exception {
-        ActivateRequest activateRequest = new ActivateRequest(90l, 0l, "").invoke(false);
+        ActivateRequest activateRequest = new ActivateRequest(90l, 0l, "", Clock.systemUTC()).invoke(false);
         HttpResponse actResponse = activateRequest.getActResponse();
         assertThat(actResponse.getStatus(), is(NOT_FOUND));
         String message = getRenderedString(actResponse);
@@ -119,13 +124,15 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
 
     @Test
     public void require_that_session_created_from_active_that_is_no_longer_active_cannot_be_activated() throws Exception {
+        Clock clock = Clock.systemUTC();
+
         long sessionId = 1;
-        activateAndAssertOK(1, 0);
+        activateAndAssertOK(1, 0, clock);
         sessionId++;
-        activateAndAssertOK(sessionId, 1);
+        activateAndAssertOK(sessionId, 1, clock);
 
         sessionId++;
-        ActivateRequest activateRequest = new ActivateRequest(sessionId, 1, "").invoke();
+        ActivateRequest activateRequest = new ActivateRequest(sessionId, 1, "", Clock.systemUTC()).invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         String message = getRenderedString(actResponse);
         assertThat(message, actResponse.getStatus(), Is.is(BAD_REQUEST));
@@ -135,7 +142,7 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
 
     @Test
     public void testAlreadyActivatedSession() throws Exception {
-        activateAndAssertOK(1, 0);
+        activateAndAssertOK(1, 0, Clock.systemUTC());
         HttpResponse response = createHandler().handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.ACTIVE, 1l));
         String message = getRenderedString(response);
         assertThat(message, response.getStatus(), Is.is(BAD_REQUEST));
@@ -144,7 +151,7 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
 
     protected abstract SessionHandler createHandler() throws Exception;
 
-    private RemoteSession createRemoteSession(long sessionId, Session.Status status, SessionZooKeeperClient zkClient) throws IOException {
+    private RemoteSession createRemoteSession(long sessionId, Session.Status status, SessionZooKeeperClient zkClient, Clock clock) throws IOException {
         zkClient.writeStatus(status);
         ZooKeeperClient zkC = new ZooKeeperClient(configCurator, new BaseDeployLogger(), false, pathProvider.getSessionDirs().append(String.valueOf(sessionId)));
         VespaModelFactory modelFactory = new VespaModelFactory(new NullConfigModelRegistry());
@@ -155,7 +162,7 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
                 .configCurator(configCurator)
                 .modelFactoryRegistry(new ModelFactoryRegistry(Collections.singletonList(modelFactory)))
                 .build();
-        RemoteSession session = new RemoteSession(TenantName.from("default"), sessionId, componentRegistry, zkClient);
+        RemoteSession session = new RemoteSession(TenantName.from("default"), sessionId, componentRegistry, zkClient, clock);
         remoteSessionRepo.addSession(session);
         return session;
     }
@@ -170,12 +177,12 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
 
     protected abstract void writeApplicationId(SessionZooKeeperClient zkc, String applicationName);
 
-    protected abstract Session activateAndAssertOK(long sessionId, long previousSessionId, String subPath) throws Exception;
+    protected abstract Session activateAndAssertOK(long sessionId, long previousSessionId, String subPath, Clock clock) throws Exception;
 
-    protected abstract RemoteSession activateAndAssertOK(long sessionId, long previousSessionId) throws Exception;
+    protected abstract RemoteSession activateAndAssertOK(long sessionId, long previousSessionId, Clock clock) throws Exception;
     
-    protected ActivateRequest activateAndAssertOKPut(long sessionId, long previousSessionId, String subPath) throws Exception {
-        ActivateRequest activateRequest = new ActivateRequest(sessionId, previousSessionId, subPath);
+    protected ActivateRequest activateAndAssertOKPut(long sessionId, long previousSessionId, String subPath, Clock clock) throws Exception {
+        ActivateRequest activateRequest = new ActivateRequest(sessionId, previousSessionId, subPath, clock);
         activateRequest.invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         String message = getRenderedString(actResponse);
@@ -188,10 +195,10 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
 
     protected abstract void assertActivationMessageOK(ActivateRequest activateRequest, String message) throws IOException;
 
-    protected abstract void activateAndAssertError(long sessionId, long previousSessionId, HttpErrorResponse.errorCodes errorCode, String expectedError) throws Exception;
+    protected abstract void activateAndAssertError(long sessionId, long previousSessionId, Clock clock, HttpErrorResponse.errorCodes errorCode, String expectedError) throws Exception;
 
-    protected ActivateRequest activateAndAssertErrorPut(long sessionId, long previousSessionId, HttpErrorResponse.errorCodes errorCode, String expectedError) throws Exception {
-        ActivateRequest activateRequest = new ActivateRequest(sessionId, previousSessionId, "");
+    protected ActivateRequest activateAndAssertErrorPut(long sessionId, long previousSessionId, Clock clock, HttpErrorResponse.errorCodes errorCode, String expectedError) throws Exception {
+        ActivateRequest activateRequest = new ActivateRequest(sessionId, previousSessionId, "", clock);
         activateRequest.invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         RemoteSession session = activateRequest.getSession();
@@ -219,16 +226,18 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
         private DeployData deployData;
         private ApplicationMetaData metaData;
         private String subPath;
+        private Clock clock;
 
-        public ActivateRequest(long sessionId, long previousSessionId, String subPath) {
-            this(sessionId, previousSessionId, Session.Status.PREPARE, subPath);
+        public ActivateRequest(long sessionId, long previousSessionId, String subPath, Clock clock) {
+            this(sessionId, previousSessionId, Session.Status.PREPARE, subPath, clock);
         }
 
-        public ActivateRequest(long sessionId, long previousSessionId, Session.Status initialStatus, String subPath) {
+        public ActivateRequest(long sessionId, long previousSessionId, Session.Status initialStatus, String subPath, Clock clock) {
             this.sessionId = sessionId;
             this.initialStatus = initialStatus; 
             this.deployData = new DeployData("foo", "bar", appName, 0l, sessionId, previousSessionId);
             this.subPath = subPath;
+            this.clock = clock;
         }
 
         public RemoteSession getSession() {
@@ -258,7 +267,7 @@ public abstract class SessionActiveHandlerTestBase extends SessionHandlerTest {
         public ActivateRequest invoke(boolean createLocalSession) throws Exception {
             SessionZooKeeperClient zkClient = new MockSessionZKClient(curator, pathProvider.getSessionDirs().append(String.valueOf(sessionId)), 
                                                                       Optional.of(ProvisionInfo.withHosts(Collections.singleton(new HostSpec("bar", Collections.emptyList())))));
-            session = createRemoteSession(sessionId, initialStatus, zkClient);
+            session = createRemoteSession(sessionId, initialStatus, zkClient, clock);
             if (createLocalSession) {
                 LocalSessionRepo repo = addLocalSession(sessionId, deployData, zkClient);
                 metaData = repo.getSession(sessionId).getMetaData();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
index 7379e4a2fab..448b2db2b71 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
@@ -23,6 +23,7 @@ import com.yahoo.vespa.config.server.configchange.ConfigChangeActions;
 import com.yahoo.vespa.config.server.session.*;
 
 import java.io.*;
+import java.time.Instant;
 import java.util.Optional;
 
 /**
@@ -95,7 +96,7 @@ public class SessionHandlerTest {
         }
 
         @Override
-        public ConfigChangeActions prepare(DeployLogger logger, PrepareParams params, Optional<ApplicationSet> application, Path tenantPath) {
+        public ConfigChangeActions prepare(DeployLogger logger, PrepareParams params, Optional<ApplicationSet> application, Path tenantPath, Instant now) {
             status = Session.Status.PREPARE;
             if (doVerboseLogging) {
                 logger.log(LogLevel.DEBUG, "debuglog");
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index 3fd338fbfde..8c4fa1ffc6c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -53,6 +53,7 @@ import javax.ws.rs.client.Client;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.time.Clock;
 import java.util.Collections;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -135,6 +136,7 @@ public class ApplicationHandlerTest {
 
     @Test
     public void testDelete() throws Exception {
+        Clock clock = Clock.systemUTC();
         ApplicationId defaultId = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
         assertApplicationExists(mytenantName, null, Zone.defaultZone());
 
@@ -162,7 +164,7 @@ public class ApplicationHandlerTest {
         
         sessionId++;
         {
-            addMockApplication(tenants.getTenant(mytenantName), defaultId, sessionId);
+            addMockApplication(tenants.getTenant(mytenantName), defaultId, sessionId, clock);
             deleteAndAssertOKResponseMocked(defaultId, true);
 
             ApplicationId fooId = new ApplicationId.Builder()
@@ -171,8 +173,8 @@ public class ApplicationHandlerTest {
 
             sessionId++;
 
-            addMockApplication(tenants.getTenant(mytenantName), fooId, sessionId);
-            addMockApplication(tenants.getTenant(foobar), fooId, sessionId);
+            addMockApplication(tenants.getTenant(mytenantName), fooId, sessionId, clock);
+            addMockApplication(tenants.getTenant(foobar), fooId, sessionId, clock);
             assertApplicationExists(mytenantName, fooId, Zone.defaultZone());
             assertApplicationExists(foobar, fooId, Zone.defaultZone());
             deleteAndAssertOKResponseMocked(fooId, true);
@@ -187,7 +189,7 @@ public class ApplicationHandlerTest {
             ApplicationId baliId = new ApplicationId.Builder()
                     .tenant(mytenantName)
                     .applicationName("bali").instanceName("quux").build();
-            addMockApplication(tenants.getTenant(mytenantName), baliId, sessionId);
+            addMockApplication(tenants.getTenant(mytenantName), baliId, sessionId, clock);
             deleteAndAssertOKResponseMocked(baliId, true);
             assertApplicationExists(mytenantName, null, Zone.defaultZone());
         }
@@ -197,7 +199,7 @@ public class ApplicationHandlerTest {
     public void testGet() throws Exception {
         long sessionId = 1;
         ApplicationId defaultId = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
-        addMockApplication(tenants.getTenant(mytenantName), defaultId, sessionId);
+        addMockApplication(tenants.getTenant(mytenantName), defaultId, sessionId, Clock.systemUTC());
         assertApplicationGeneration(defaultId, Zone.defaultZone(), 1, true);
         assertApplicationGeneration(defaultId, Zone.defaultZone(), 1, false);
     }
@@ -206,7 +208,7 @@ public class ApplicationHandlerTest {
     public void testRestart() throws Exception {
         long sessionId = 1;
         ApplicationId application = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
-        addMockApplication(tenants.getTenant(mytenantName), application, sessionId);
+        addMockApplication(tenants.getTenant(mytenantName), application, sessionId, Clock.systemUTC());
         assertFalse(provisioner.restarted);
         restart(application, Zone.defaultZone());
         assertTrue(provisioner.restarted);
@@ -217,7 +219,7 @@ public class ApplicationHandlerTest {
     public void testConverge() throws Exception {
         long sessionId = 1;
         ApplicationId application = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
-        addMockApplication(tenants.getTenant(mytenantName), application, sessionId);
+        addMockApplication(tenants.getTenant(mytenantName), application, sessionId, Clock.systemUTC());
         converge(application, Zone.defaultZone());
     }
 
@@ -225,7 +227,7 @@ public class ApplicationHandlerTest {
     public void testGrabLog() throws Exception {
         long sessionId = 1;
         ApplicationId application = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
-        addMockApplication(tenants.getTenant(mytenantName), application, sessionId);
+        addMockApplication(tenants.getTenant(mytenantName), application, sessionId, Clock.systemUTC());
         assertEquals("log line", grabLog(application, Zone.defaultZone()));
     }
 
@@ -233,7 +235,7 @@ public class ApplicationHandlerTest {
     public void testClusterControllerStatus() throws Exception {
         long sessionId = 1;
         ApplicationId application = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(mytenantName).build();
-        addMockApplication(tenants.getTenant(mytenantName), application, sessionId);
+        addMockApplication(tenants.getTenant(mytenantName), application, sessionId, Clock.systemUTC());
         String host = "foo.yahoo.com";
         String url = toUrlPath(application, Zone.defaultZone(), true) + "/clustercontroller/" + host + "/status/v1/clusterName1";
 
@@ -259,7 +261,7 @@ public class ApplicationHandlerTest {
                 new HttpProxy(new SimpleHttpFetcher()),
                 new LogServerLogGrabber());
         final ApplicationId applicationId = ApplicationId.defaultId();
-        addMockApplication(tenants.getTenant(mytenantName), applicationId, 1);
+        addMockApplication(tenants.getTenant(mytenantName), applicationId, 1, Clock.systemUTC());
         assertApplicationExists(mytenantName, applicationId, Zone.defaultZone());
         provisioner.activated = true;
 
@@ -269,14 +271,14 @@ public class ApplicationHandlerTest {
         Assert.assertTrue(provisioner.activated);
     }
 
-    static void addMockApplication(Tenant tenant, ApplicationId applicationId, long sessionId) {
+    static void addMockApplication(Tenant tenant, ApplicationId applicationId, long sessionId, Clock clock) {
         tenant.getApplicationRepo().createPutApplicationTransaction(applicationId, sessionId).commit();
         ApplicationPackage app = FilesApplicationPackage.fromFile(testApp);
         tenant.getLocalSessionRepo().addSession(new SessionHandlerTest.MockSession(sessionId, app, applicationId));
         TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
                 .modelFactoryRegistry(new ModelFactoryRegistry(Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry()))))
                 .build();
-        tenant.getRemoteSessionRepo().addSession(new RemoteSession(tenant.getName(), sessionId, componentRegistry, new MockSessionZKClient(app)));
+        tenant.getRemoteSessionRepo().addSession(new RemoteSession(tenant.getName(), sessionId, componentRegistry, new MockSessionZKClient(app), clock));
     }
 
     static Tenants addApplication(ApplicationId applicationId, long sessionId) throws Exception {
@@ -322,7 +324,8 @@ public class ApplicationHandlerTest {
                                           .modelFactoryRegistry(new ModelFactoryRegistry(
                                                   Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry()))))
                                           .build(),
-                                  sessionClient));
+                                  sessionClient,
+                                  Clock.systemUTC()));
         return tenants;
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index 288c05e7a6f..e439f424c45 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -16,6 +16,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.time.Clock;
 import java.util.Collections;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -62,14 +63,14 @@ public class HostHandlerTest {
         assertThat(hostRegistries, is(hostHandler.hostRegistries));
         long sessionId = 1;
         ApplicationId id = ApplicationId.from(mytenant, ApplicationName.defaultName(), InstanceName.defaultName());
-        ApplicationHandlerTest.addMockApplication(tenants.getTenant(mytenant), id, sessionId);
+        ApplicationHandlerTest.addMockApplication(tenants.getTenant(mytenant), id, sessionId, Clock.systemUTC());
         assertApplicationForHost(hostname, mytenant, id, Zone.defaultZone());
     }
 
     @Test
     public void require_that_handler_gives_error_for_unknown_hostname() throws Exception {
         long sessionId = 1;
-        ApplicationHandlerTest.addMockApplication(tenants.getTenant(mytenant), ApplicationId.defaultId(), sessionId);
+        ApplicationHandlerTest.addMockApplication(tenants.getTenant(mytenant), ApplicationId.defaultId(), sessionId, Clock.systemUTC());
         final String hostname = "unknown";
         assertErrorForHost(hostname,
                 Response.Status.NOT_FOUND,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 5adc3a108f7..01855637005 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -46,6 +46,7 @@ import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.time.Clock;
 import java.util.Collection;
 import java.util.List;
 
@@ -76,13 +77,14 @@ public class SessionActiveHandlerTest extends SessionActiveHandlerTestBase {
 
     @Test
     public void testActivation() throws Exception {
-        activateAndAssertOK(1, 0);
+        activateAndAssertOK(1, 0, Clock.systemUTC());
     }
 
     @Test
     public void testActivationWithActivationInBetween() throws Exception {
-        activateAndAssertOK(90l, 0l);
-        activateAndAssertError(92l, 89l,
+        Clock clock = Clock.systemUTC();
+        activateAndAssertOK(90l, 0l, clock);
+        activateAndAssertError(92l, 89l, clock,
                 HttpErrorResponse.errorCodes.BAD_REQUEST,
                 "tenant:"+tenant+" app:default:default Cannot activate session 92 because the currently active session (90) has changed since session 92 was created (was 89 at creation time)");
     }
@@ -90,10 +92,11 @@ public class SessionActiveHandlerTest extends SessionActiveHandlerTestBase {
 
     @Test
     public void testActivationOfUnpreparedSession() throws Exception {
+        Clock clock = Clock.systemUTC();
         // Needed so we can test that previous active session is still active after a failed activation
-        RemoteSession firstSession = activateAndAssertOK(90l, 0l);
+        RemoteSession firstSession = activateAndAssertOK(90l, 0l, clock);
         long sessionId = 91L;
-        ActivateRequest activateRequest = new ActivateRequest(sessionId, 0l, Session.Status.NEW, "").invoke();
+        ActivateRequest activateRequest = new ActivateRequest(sessionId, 0l, Session.Status.NEW, "", clock).invoke();
         HttpResponse actResponse = activateRequest.getActResponse();
         RemoteSession session = activateRequest.getSession();
         assertThat(actResponse.getStatus(), is(Response.Status.BAD_REQUEST));
@@ -115,19 +118,19 @@ public class SessionActiveHandlerTest extends SessionActiveHandlerTestBase {
     public void require_that_handler_gives_error_when_provisioner_activated_fails() throws Exception {
         hostProvisioner = new FailingMockProvisioner();
         hostProvisioner.activated = false;
-        activateAndAssertError(1, 0, HttpErrorResponse.errorCodes.BAD_REQUEST, "Cannot activate application");
+        activateAndAssertError(1, 0, Clock.systemUTC(), HttpErrorResponse.errorCodes.BAD_REQUEST, "Cannot activate application");
         assertFalse(hostProvisioner.activated);
     }
 
     @Override
-    protected RemoteSession activateAndAssertOK(long sessionId, long previousSessionId) throws Exception {
-        ActivateRequest activateRequest = activateAndAssertOKPut(sessionId, previousSessionId, "");
+    protected RemoteSession activateAndAssertOK(long sessionId, long previousSessionId, Clock clock) throws Exception {
+        ActivateRequest activateRequest = activateAndAssertOKPut(sessionId, previousSessionId, "", clock);
         return activateRequest.getSession();
     }
 
     @Override
-    protected Session activateAndAssertOK(long sessionId, long previousSessionId, String subPath) throws Exception {
-        ActivateRequest activateRequest = activateAndAssertOKPut(sessionId, previousSessionId, subPath);
+    protected Session activateAndAssertOK(long sessionId, long previousSessionId, String subPath, Clock clock) throws Exception {
+        ActivateRequest activateRequest = activateAndAssertOKPut(sessionId, previousSessionId, subPath, clock);
         return activateRequest.getSession();
     }
     
@@ -146,9 +149,9 @@ public class SessionActiveHandlerTest extends SessionActiveHandlerTestBase {
     }
 
     @Override
-    protected void activateAndAssertError(long sessionId, long previousSessionId, HttpErrorResponse.errorCodes errorCode, String expectedError) throws Exception {
+    protected void activateAndAssertError(long sessionId, long previousSessionId, Clock clock, HttpErrorResponse.errorCodes errorCode, String expectedError) throws Exception {
         hostProvisioner.activated = false;
-        activateAndAssertErrorPut(sessionId, previousSessionId, errorCode, expectedError);
+        activateAndAssertErrorPut(sessionId, previousSessionId, clock, errorCode, expectedError);
         assertFalse(hostProvisioner.activated);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index f321f6f67ef..2d63dcf9b0b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -42,6 +42,8 @@ import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.time.Clock;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -146,7 +148,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     /**
      * A mock remote session repo based on contents of local repo
      */
-    private RemoteSessionRepo fromLocalSessionRepo(LocalSessionRepo localRepo) {
+    private RemoteSessionRepo fromLocalSessionRepo(LocalSessionRepo localRepo, Clock clock) {
         RemoteSessionRepo remoteRepo = new RemoteSessionRepo();
         PathProvider pathProvider = new PathProvider(Path.createRoot());
         for (LocalSession ls : localRepo.listSessions()) {
@@ -155,7 +157,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
             if (ls.getStatus()!=null) zooKeeperClient.writeStatus(ls.getStatus());
             RemoteSession remSess = new RemoteSession(TenantName.from("default"), ls.getSessionId(),
                                                       new TestComponentRegistry.Builder().curator(curator).build(),
-                                                      zooKeeperClient);
+                                                      zooKeeperClient, 
+                                                      clock);
             remoteRepo.addSession(remSess);
         }
         return remoteRepo;
@@ -165,7 +168,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     public void require_get_response_activate_url_on_ok() throws Exception {
         MockSession session = new MockSession(1, null);
         localRepo.addSession(session);
-        SessionHandler sessHandler = createHandler(fromLocalSessionRepo(localRepo));
+        SessionHandler sessHandler = createHandler(fromLocalSessionRepo(localRepo, Clock.systemUTC()));
         sessHandler.handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, 1L));
         session.setStatus(Session.Status.PREPARE);
         zooKeeperClient.writeStatus(Session.Status.PREPARE);
@@ -177,7 +180,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     public void require_get_response_error_on_not_prepared() throws Exception {
         MockSession session = new MockSession(1, null);
         localRepo.addSession(session);
-        SessionHandler sessHandler = createHandler(fromLocalSessionRepo(localRepo));
+        SessionHandler sessHandler = createHandler(fromLocalSessionRepo(localRepo, Clock.systemUTC()));
         session.setStatus(Session.Status.NEW);
         zooKeeperClient.writeStatus(Session.Status.NEW);
         HttpResponse getResponse = sessHandler.handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.GET, Cmd.PREPARED, 1L));
@@ -197,7 +200,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         MockSession session = new MockSession(1, null);
         localRepo.addSession(session);
         session.setStatus(Session.Status.ACTIVATE);
-        SessionHandler sessionHandler = createHandler(fromLocalSessionRepo(localRepo));
+        SessionHandler sessionHandler = createHandler(fromLocalSessionRepo(localRepo, Clock.systemUTC()));
         HttpResponse putResponse = sessionHandler.handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, 1L));
         HandlerTest.assertHttpStatusCodeErrorCodeAndMessage(putResponse, BAD_REQUEST,
                                                             HttpErrorResponse.errorCodes.BAD_REQUEST,
@@ -208,7 +211,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     public void require_get_response_error_when_session_id_does_not_exist() throws Exception {
         MockSession session = new MockSession(1, null);
         localRepo.addSession(session);
-        SessionHandler sessHandler = createHandler(fromLocalSessionRepo(localRepo));
+        SessionHandler sessHandler = createHandler(fromLocalSessionRepo(localRepo, Clock.systemUTC()));
         HttpResponse getResponse = sessHandler.handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.GET, Cmd.PREPARED, 9999L));
         HandlerTest.assertHttpStatusCodeErrorCodeAndMessage(getResponse, NOT_FOUND,
                                                             HttpErrorResponse.errorCodes.NOT_FOUND,
@@ -397,7 +400,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         }
 
         @Override
-        public ConfigChangeActions prepare(DeployLogger logger, PrepareParams params, Optional<ApplicationSet> application, Path tenantPath) {
+        public ConfigChangeActions prepare(DeployLogger logger, PrepareParams params, Optional<ApplicationSet> application, Path tenantPath, Instant now) {
             throw exception;
         }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
index eb51627bb95..d5f4dd573c6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
@@ -5,6 +5,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
+import java.time.Clock;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
@@ -84,13 +85,13 @@ public class TenantHandlerTest extends TenantTest {
     @Test
     public void testDeleteTenantWithActiveApplications() throws Exception {
         putSync(HttpRequest.createTestRequest("http://deploy.example.yahoo.com:80/application/v2/tenant/" + a, Method.PUT));
-        final Tenant tenant = tenants.getTenant(a);
+        Tenant tenant = tenants.getTenant(a);
         assertEquals(a, tenant.getName());
 
-        final int sessionId = 1;
+        int sessionId = 1;
         ApplicationId app = ApplicationId.from(a,
                                                ApplicationName.from("foo"), InstanceName.defaultName());
-        ApplicationHandlerTest.addMockApplication(tenant, app, sessionId);
+        ApplicationHandlerTest.addMockApplication(tenant, app, sessionId, Clock.systemUTC());
 
         try {
             handler.handleDELETE(HttpRequest.createTestRequest("http://deploy.example.yahoo.com:80/application/v2/tenant/" + a, Method.DELETE));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
index cf9c046dada..f0086eabd26 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
@@ -21,6 +21,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
+import java.time.Instant;
 import java.util.*;
 
 import static org.hamcrest.core.Is.is;
@@ -59,7 +60,7 @@ public class LocalSessionTest {
     public void require_that_session_status_is_updated() throws Exception {
         LocalSession session = createSession(TenantName.defaultName(), 3);
         assertThat(session.getStatus(), is(Session.Status.NEW));
-        doPrepare(session);
+        doPrepare(session, Instant.now());
         assertThat(session.getStatus(), is(Session.Status.PREPARE));
         session.createActivateTransaction().commit();
         assertThat(session.getStatus(), is(Session.Status.ACTIVATE));
@@ -68,7 +69,7 @@ public class LocalSessionTest {
     @Test
     public void require_that_marking_session_modified_changes_status_to_new() throws Exception {
         LocalSession session = createSession(TenantName.defaultName(), 3);
-        doPrepare(session);
+        doPrepare(session, Instant.now());
         assertThat(session.getStatus(), is(Session.Status.PREPARE));
         session.getApplicationFile(Path.createRoot(), LocalSession.Mode.READ);
         assertThat(session.getStatus(), is(Session.Status.PREPARE));
@@ -81,7 +82,7 @@ public class LocalSessionTest {
         SessionTest.MockSessionPreparer preparer = new SessionTest.MockSessionPreparer();
         LocalSession session = createSession(TenantName.defaultName(), 3, preparer);
         assertFalse(preparer.isPrepared);
-        doPrepare(session);
+        doPrepare(session, Instant.now());
         assertTrue(preparer.isPrepared);
         assertThat(session.getStatus(), is(Session.Status.PREPARE));
     }
@@ -130,7 +131,7 @@ public class LocalSessionTest {
         ApplicationId origId = new ApplicationId.Builder()
                                .tenant("tenant")
                                .applicationName("foo").instanceName("quux").build();
-        doPrepare(session, new PrepareParams.Builder().applicationId(origId).build());
+        doPrepare(session, new PrepareParams.Builder().applicationId(origId).build(), Instant.now());
         ProvisionInfo info = session.getProvisionInfo();
         assertNotNull(info);
         assertThat(info.getHosts().size(), is(1));
@@ -140,7 +141,7 @@ public class LocalSessionTest {
     @Test
     public void require_that_application_metadata_is_correct() throws Exception {
         LocalSession session = createSession(TenantName.defaultName(), 3);
-        doPrepare(session, new PrepareParams.Builder().build());
+        doPrepare(session, new PrepareParams.Builder().build(), Instant.now());
         assertThat(session.getMetaData().toString(), is("n/a, n/a, 0, 0, , 0"));
     }
 
@@ -167,12 +168,12 @@ public class LocalSessionTest {
         return new LocalSession(tenant, sessionId, preparer, new SessionContext(FilesApplicationPackage.fromFile(testApp), zkc, sessionDir, new MemoryTenantApplications(), new HostRegistry<>(), superModelGenerationCounter));
     }
 
-    private void doPrepare(LocalSession session) {
-        doPrepare(session, new PrepareParams.Builder().build());
+    private void doPrepare(LocalSession session, Instant now) {
+        doPrepare(session, new PrepareParams.Builder().build(), now);
     }
 
-    private void doPrepare(LocalSession session, PrepareParams params) {
-        session.prepare(getLogger(false), params, Optional.empty(), tenantPath);
+    private void doPrepare(LocalSession session, PrepareParams params, Instant now) {
+        session.prepare(getLogger(false), params, Optional.empty(), tenantPath, now);
     }
 
     DeployHandlerLogger getLogger(boolean verbose) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
index d6b7a38345e..44f304847ba 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
+import java.time.Clock;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneOffset;
@@ -59,28 +60,29 @@ public class RemoteSessionTest {
 
     @Test
     public void require_that_session_is_initialized() {
-        Session session = createSession(2);
+        Clock clock = Clock.systemUTC();
+        Session session = createSession(2, clock);
         assertThat(session.getSessionId(), is(2l));
-        session = createSession(Long.MAX_VALUE);
+        session = createSession(Long.MAX_VALUE, clock);
         assertThat(session.getSessionId(), is(Long.MAX_VALUE));
     }
 
     @Test
     public void require_that_applications_are_loaded() throws IOException, SAXException {
-        RemoteSession session = createSession(3, Arrays.asList(new MockModelFactory(), new VespaModelFactory(new NullConfigModelRegistry())));
+        RemoteSession session = createSession(3, Arrays.asList(new MockModelFactory(), new VespaModelFactory(new NullConfigModelRegistry())), Clock.systemUTC());
         session.loadPrepared();
         ApplicationSet applicationSet = session.ensureApplicationLoaded();
         assertNotNull(applicationSet);
         assertThat(applicationSet.getApplicationGeneration(), is(3l));
-        assertThat(applicationSet.getForVersionOrLatest(Optional.empty()).getId().application().value(), is("foo"));
-        assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty()).getModel());
+        assertThat(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getId().application().value(), is("foo"));
+        assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getModel());
         session.deactivate();
 
         applicationSet = session.ensureApplicationLoaded();
         assertNotNull(applicationSet);
         assertThat(applicationSet.getApplicationGeneration(), is(3l));
-        assertThat(applicationSet.getForVersionOrLatest(Optional.empty()).getId().application().value(), is("foo"));
-        assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty()).getModel());
+        assertThat(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getId().application().value(), is("foo"));
+        assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty(), Instant.now()).getModel());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -93,7 +95,7 @@ public class RemoteSessionTest {
         okFactory.vespaVersion = Version.fromIntValues(1, 1, 0);
         okFactory.throwOnLoad = false;
 
-        RemoteSession session = createSession(3, Arrays.asList(okFactory, failingFactory));
+        RemoteSession session = createSession(3, Arrays.asList(okFactory, failingFactory), failingFactory.clock());
         session.loadPrepared();
     }
 
@@ -111,7 +113,7 @@ public class RemoteSessionTest {
         failingFactory.vespaVersion = Version.fromIntValues(2, 0, 0);
         failingFactory.throwOnLoad = true;
 
-        RemoteSession session = createSession(3, Arrays.asList(okFactory1, failingFactory, okFactory2));
+        RemoteSession session = createSession(3, Arrays.asList(okFactory1, failingFactory, okFactory2), failingFactory.clock());
         session.loadPrepared();
     }
 
@@ -126,7 +128,7 @@ public class RemoteSessionTest {
         okFactory.vespaVersion = Version.fromIntValues(1, 2, 0);
         okFactory.throwOnLoad = false;
 
-        RemoteSession session = createSession(3, Arrays.asList(okFactory, failingFactory));
+        RemoteSession session = createSession(3, Arrays.asList(okFactory, failingFactory), failingFactory.clock());
         session.loadPrepared();
     }
 
@@ -141,7 +143,7 @@ public class RemoteSessionTest {
         okFactory.vespaVersion = Version.fromIntValues(2, 0, 0);
         okFactory.throwOnLoad = false;
 
-        RemoteSession session = createSession(3, Arrays.asList(okFactory, failingFactory));
+        RemoteSession session = createSession(3, Arrays.asList(okFactory, failingFactory), failingFactory.clock());
         session.loadPrepared();
     }
 
@@ -161,7 +163,7 @@ public class RemoteSessionTest {
         tooNewFactory.vespaVersion = Version.fromIntValues(2, 0, 0);
         tooNewFactory.throwOnLoad = true;
 
-        RemoteSession session = createSession(3, Arrays.asList(tooNewFactory, okFactory, failingFactory));
+        RemoteSession session = createSession(3, Arrays.asList(tooNewFactory, okFactory, failingFactory), failingFactory.clock());
         session.loadPrepared();
     }
 
@@ -179,7 +181,7 @@ public class RemoteSessionTest {
         okFactory.throwOnLoad = false;
 
         SessionZooKeeperClient zkc = new MockSessionZKClient(curator, pathProvider.getSessionDir(3), application);
-        RemoteSession session = createSession(3, zkc, Arrays.asList(okFactory, failingFactory));
+        RemoteSession session = createSession(3, zkc, Arrays.asList(okFactory, failingFactory), failingFactory.clock());
         session.loadPrepared();
 
         // Does not cause an exception because model version 3 is skipped
@@ -188,7 +190,7 @@ public class RemoteSessionTest {
     @Test
     public void require_that_session_status_is_updated() throws IOException, SAXException {
         SessionZooKeeperClient zkc = new MockSessionZKClient(curator, pathProvider.getSessionDir(3));
-        RemoteSession session = createSession(3, zkc);
+        RemoteSession session = createSession(3, zkc, Clock.systemUTC());
         assertThat(session.getStatus(), is(Session.Status.NEW));
         zkc.writeStatus(Session.Status.PREPARE);
         assertThat(session.getStatus(), is(Session.Status.PREPARE));
@@ -202,7 +204,7 @@ public class RemoteSessionTest {
         try {
             int sessionId = 3;
             SessionZooKeeperClient zkc = new MockSessionZKClient(curator, pathProvider.getSessionDir(sessionId));
-            createSession(sessionId, zkc, Collections.singletonList(mockModelFactory), permanentApp).ensureApplicationLoaded();
+            createSession(sessionId, zkc, Collections.singletonList(mockModelFactory), permanentApp, mockModelFactory.clock()).ensureApplicationLoaded();
         } catch (Exception e) {
             e.printStackTrace();
             // ignore, we're not interested in deploy errors as long as the below state is OK.
@@ -211,22 +213,23 @@ public class RemoteSessionTest {
         assertTrue(mockModelFactory.modelContext.permanentApplicationPackage().isPresent());
     }
 
-    private RemoteSession createSession(long sessionId) {
-        return createSession(sessionId, Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry())));
+    private RemoteSession createSession(long sessionId, Clock clock) {
+        return createSession(sessionId, Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry())), clock);
     }
-    private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc) {
-        return createSession(sessionId, zkc, Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry())));
+    private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc, Clock clock) {
+        return createSession(sessionId, zkc, Collections.singletonList(new VespaModelFactory(new NullConfigModelRegistry())), clock);
     }
-    private RemoteSession createSession(long sessionId, List<ModelFactory> modelFactories) {
+    private RemoteSession createSession(long sessionId, List<ModelFactory> modelFactories, Clock clock) {
         SessionZooKeeperClient zkc = new MockSessionZKClient(curator, pathProvider.getSessionDir(sessionId));
-        return createSession(sessionId, zkc, modelFactories);
+        return createSession(sessionId, zkc, modelFactories, clock);
     }
 
-    private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc, List<ModelFactory> modelFactories) {
-        return createSession(sessionId, zkc, modelFactories, Optional.empty());
+    private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc, List<ModelFactory> modelFactories, Clock clock) {
+        return createSession(sessionId, zkc, modelFactories, Optional.empty(), clock);
     }
 
-    private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc, List<ModelFactory> modelFactories, Optional<PermanentApplicationPackage> permanentApplicationPackage) {
+    private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc, List<ModelFactory> modelFactories, 
+                                        Optional<PermanentApplicationPackage> permanentApplicationPackage, Clock clock) {
         zkc.writeStatus(Session.Status.NEW);
         zkc.writeApplicationId(new ApplicationId.Builder().applicationName("foo").instanceName("bim").build());
         TestComponentRegistry.Builder registryBuilder = new TestComponentRegistry.Builder()
@@ -237,7 +240,8 @@ public class RemoteSessionTest {
 
         return new RemoteSession(TenantName.from("default"), sessionId,
                                  registryBuilder.build(),
-                                 zkc);
+                                 zkc,
+                                 clock);
     }
 
     private class MockModelFactory implements ModelFactory {
@@ -248,6 +252,8 @@ public class RemoteSessionTest {
 
         /** The validation overrides of this, or null if none */
         private final String validationOverrides;
+        
+        private Clock clock = Clock.fixed(LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant(), ZoneOffset.UTC);
 
         public MockModelFactory() { this(null); }
 
@@ -259,6 +265,9 @@ public class RemoteSessionTest {
         public Version getVersion() {
             return vespaVersion;
         }
+        
+        /** Returns the clock used by this, which is fixed at the instant 2000-01-01T00:00:00 */
+        public Clock clock() { return clock; }
 
         @Override
         public Model createModel(ModelContext modelContext) {
@@ -271,9 +280,8 @@ public class RemoteSessionTest {
 
         public Model loadModel() {
             try {
-                Instant now = LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant();
                 ApplicationPackage application = new MockApplicationPackage.Builder().withEmptyHosts().withEmptyServices().withValidationOverrides(validationOverrides).build();
-                DeployState deployState = new DeployState.Builder().applicationPackage(application).now(now).build();
+                DeployState deployState = new DeployState.Builder().applicationPackage(application).now(clock.instant()).build();
                 return new VespaModel(deployState);
             } catch (Exception e) {
                 throw new RuntimeException(e);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 1ef350461ab..13815e30bbd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -40,6 +40,7 @@ import org.xml.sax.SAXException;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Instant;
 import java.util.*;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -99,7 +100,7 @@ public class SessionPreparerTest extends TestWithCurator {
     @Test(expected = InvalidApplicationException.class)
     public void require_that_application_validation_exception_is_not_caught() throws IOException, SAXException {
         FilesApplicationPackage app = getApplicationPackage(invalidTestApp);
-        preparer.prepare(getContext(app), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath);
+        preparer.prepare(getContext(app), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
     }
 
     @Test
@@ -107,14 +108,14 @@ public class SessionPreparerTest extends TestWithCurator {
         FilesApplicationPackage app = getApplicationPackage(invalidTestApp);
         preparer.prepare(getContext(app), getLogger(),
                          new PrepareParams.Builder().ignoreValidationErrors(true).timeoutBudget(TimeoutBudgetTest.day()).build(),
-                         Optional.empty(), tenantPath);
+                         Optional.empty(), tenantPath, Instant.now());
     }
 
     @Test
     public void require_that_zookeeper_is_not_written_to_if_dryrun() throws IOException {
         preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(),
                          new PrepareParams.Builder().dryRun(true).timeoutBudget(TimeoutBudgetTest.day()).build(),
-                         Optional.empty(), tenantPath);
+                         Optional.empty(), tenantPath, Instant.now());
         assertFalse(configCurator.exists(appPath.append(ConfigCurator.USERAPP_ZK_SUBPATH).append("services.xml").getAbsolute()));
     }
 
@@ -122,7 +123,7 @@ public class SessionPreparerTest extends TestWithCurator {
     public void require_that_filedistribution_is_ignored_on_dryrun() throws IOException {
         preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(),
                          new PrepareParams.Builder().dryRun(true).timeoutBudget(TimeoutBudgetTest.day()).build(),
-                         Optional.empty(), tenantPath);
+                         Optional.empty(), tenantPath, Instant.now());
         assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().sendDeployedFilesCalled, is(0));
         assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().limitSendingOfDeployedFilesToCalled, is(0));
         assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().reloadDeployFileDistributorCalled, is(0));
@@ -130,7 +131,7 @@ public class SessionPreparerTest extends TestWithCurator {
 
     @Test
     public void require_that_application_is_prepared() throws Exception {
-        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath);
+        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
         assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().sendDeployedFilesCalled, is(2));
         assertThat(fileDistributionFactory.mockFileDistributionProvider.getMockFileDBHandler().limitSendingOfDeployedFilesToCalled, is(2));
         // Should be called only once no matter how many model versions are built
@@ -144,7 +145,7 @@ public class SessionPreparerTest extends TestWithCurator {
                 new TestModelFactory(Version.fromIntValues(1, 2, 3)),
                 new FailingModelFactory(Version.fromIntValues(3, 2, 1), new IllegalArgumentException("BOOHOO"))));
         preparer = createPreparer(modelFactoryRegistry, HostProvisionerProvider.empty());
-        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath);
+        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
     }
 
     @Test(expected = InvalidApplicationException.class)
@@ -153,14 +154,14 @@ public class SessionPreparerTest extends TestWithCurator {
                 new TestModelFactory(Version.fromIntValues(3, 2, 3)),
                 new FailingModelFactory(Version.fromIntValues(1, 2, 1), new IllegalArgumentException("BOOHOO"))));
         preparer = createPreparer(modelFactoryRegistry, HostProvisionerProvider.empty());
-        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath);
+        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
     }
 
     @Test(expected = InvalidApplicationException.class)
     public void require_exception_for_overlapping_host() throws IOException {
         SessionContext ctx = getContext(getApplicationPackage(testApp));
         ((HostRegistry<ApplicationId>)ctx.getHostValidator()).update(applicationId("foo"), Collections.singletonList("mytesthost"));
-        preparer.prepare(ctx, new BaseDeployLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath);
+        preparer.prepare(ctx, new BaseDeployLogger(), new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
     }
     
     @Test
@@ -172,7 +173,7 @@ public class SessionPreparerTest extends TestWithCurator {
             System.out.println(level + ": "+message);
             if (level.equals(LogLevel.WARNING) && message.contains("The host mytesthost is already in use")) logged.append("ok");
         };
-        preparer.prepare(ctx, logger, new PrepareParams.Builder().build(), Optional.empty(), tenantPath);
+        preparer.prepare(ctx, logger, new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
         assertEquals(logged.toString(), "");
     }
 
@@ -183,7 +184,7 @@ public class SessionPreparerTest extends TestWithCurator {
                                .tenant(tenant)
                                .applicationName("foo").instanceName("quux").build();
         PrepareParams params = new PrepareParams.Builder().applicationId(origId).build();
-        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), params, Optional.empty(), tenantPath);
+        preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(), params, Optional.empty(), tenantPath, Instant.now());
         SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, appPath);
         assertTrue(configCurator.exists(appPath.append(SessionZooKeeperClient.APPLICATION_ID_PATH).getAbsolute()));
         assertThat(zkc.readApplicationId(), is(origId));
@@ -200,7 +201,7 @@ public class SessionPreparerTest extends TestWithCurator {
         preparer = createPreparer(modelFactoryRegistry, HostProvisionerProvider.empty());
         List<RestartActions.Entry> actions =
                 preparer.prepare(getContext(getApplicationPackage(testApp)), getLogger(),
-                                 new PrepareParams.Builder().build(), Optional.empty(), tenantPath)
+                                 new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now())
                         .getRestartActions().getEntries();
         assertThat(actions.size(), is(1));
         assertThat(actions.get(0).getMessages(), equalTo(ImmutableSet.of("change", "other change")));
@@ -216,7 +217,7 @@ public class SessionPreparerTest extends TestWithCurator {
         final ApplicationId applicationId = applicationId("test");
         PrepareParams params = new PrepareParams.Builder().applicationId(applicationId).rotations(rotations).build();
         File app = new File("src/test/resources/deploy/app");
-        preparer.prepare(getContext(getApplicationPackage(app)), getLogger(), params, Optional.empty(), tenantPath);
+        preparer.prepare(getContext(getApplicationPackage(app)), getLogger(), params, Optional.empty(), tenantPath, Instant.now());
         assertThat(readRotationsFromZK(applicationId), contains(new Rotation(rotations)));
     }
 
@@ -232,7 +233,7 @@ public class SessionPreparerTest extends TestWithCurator {
         new Rotations(curator, tenantPath).writeRotationsToZooKeeper(applicationId, Collections.singleton(new Rotation(rotations)));
         final PrepareParams params = new PrepareParams.Builder().applicationId(applicationId).build();
         final File app = new File("src/test/resources/deploy/app");
-        preparer.prepare(getContext(getApplicationPackage(app)), getLogger(), params, Optional.empty(), tenantPath);
+        preparer.prepare(getContext(getApplicationPackage(app)), getLogger(), params, Optional.empty(), tenantPath, Instant.now());
 
         // check that the rotation from zookeeper were used
         final ModelContext modelContext = modelFactory.getModelContext();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java
index 9d5890377c5..71b31754c5d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionTest.java
@@ -7,6 +7,7 @@ import com.yahoo.vespa.config.server.application.ApplicationSet;
 import com.yahoo.vespa.config.server.configchange.ConfigChangeActions;
 import com.yahoo.vespa.curator.mock.MockCurator;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Optional;
 
@@ -24,7 +25,7 @@ public class SessionTest {
         }
 
         @Override
-        public ConfigChangeActions prepare(SessionContext context, DeployLogger logger, PrepareParams params, Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath) {
+        public ConfigChangeActions prepare(SessionContext context, DeployLogger logger, PrepareParams params, Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath, Instant now) {
             isPrepared = true;
             return new ConfigChangeActions(new ArrayList<>());
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
index a5b4739091b..65f546e149a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
@@ -47,6 +47,7 @@ import org.xml.sax.SAXException;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Clock;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -96,17 +97,17 @@ public class TenantRequestHandlerTest extends TestWithCurator {
         deployer.deploy(FilesApplicationPackage.fromFile(appDir), Collections.singletonMap(vespaVersion, new MockFileRegistry()), Collections.emptyMap());
     }
 
-    private ApplicationSet reloadConfig(long id) {
-        return reloadConfig(id, "default");
+    private ApplicationSet reloadConfig(long id, Clock clock) {
+        return reloadConfig(id, "default", clock);
     }
 
-    private ApplicationSet reloadConfig(long id, String application) {
+    private ApplicationSet reloadConfig(long id, String application, Clock clock) {
         SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, configCurator,
                                                                 new PathProvider(Path.createRoot()).getSessionDir(id),
                                                                 new TestConfigDefinitionRepo(),
                                                                 "", Optional.empty());
         zkc.writeApplicationId(new ApplicationId.Builder().tenant(tenant).applicationName(application).build());
-        RemoteSession session = new RemoteSession(tenant, id, componentRegistry, zkc);
+        RemoteSession session = new RemoteSession(tenant, id, componentRegistry, zkc, clock);
         return session.ensureApplicationLoaded();
     }
 
@@ -146,15 +147,17 @@ public class TenantRequestHandlerTest extends TestWithCurator {
 
     @Test
     public void testReloadConfig() throws IOException, SAXException {
+        Clock clock = Clock.systemUTC();
         ApplicationId applicationId = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build();
-        server.reloadConfig(reloadConfig(1));
+
+        server.reloadConfig(reloadConfig(1, clock));
         assertThat(listener.reloaded.get(), is(1));
         // Using only payload list for this simple test
     	SimpletypesConfig config = resolve(SimpletypesConfig.class, server, "");
         assertThat(config.intval(), is(1337));
         assertThat(server.getApplicationGeneration(applicationId, Optional.of(vespaVersion)), is(1l));
 
-        server.reloadConfig(reloadConfig(1l));
+        server.reloadConfig(reloadConfig(1l, clock));
         config = resolve(SimpletypesConfig.class, server, "");
         assertThat(config.intval(), is(1337));
         assertThat(listener.reloaded.get(), is(2));
@@ -164,7 +167,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
 
         listener.reloaded.set(0);
         feedApp(app2, 2);
-        server.reloadConfig(reloadConfig(2l));
+        server.reloadConfig(reloadConfig(2l, clock));
         config = resolve(SimpletypesConfig.class, server, "");
         assertThat(config.intval(), is(1330));
         assertThat(listener.reloaded.get(), is(1));
@@ -173,7 +176,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
 
     @Test
     public void testRemoveApplication() {
-        server.reloadConfig(reloadConfig(1));
+        server.reloadConfig(reloadConfig(1, Clock.systemUTC()));
         assertThat(listener.removed.get(), is(0));
         server.removeApplication(new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build());
         assertThat(listener.removed.get(), is(1));
@@ -190,7 +193,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
                               .tenant(tenant)
                               .applicationName("myapp").instanceName("myinst").build();
         zkc.writeApplicationId(appId);
-        RemoteSession session = new RemoteSession(appId.tenant(), id, componentRegistry, zkc);
+        RemoteSession session = new RemoteSession(appId.tenant(), id, componentRegistry, zkc, Clock.systemUTC());
         server.reloadConfig(session.ensureApplicationLoaded());
         SimpletypesConfig config = resolve(SimpletypesConfig.class, server, appId, vespaVersion, "");
         assertThat(config.intval(), is(1337));
@@ -229,7 +232,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
         feedApp(appDir, sessionId, appId);
         SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, new PathProvider(Path.createRoot()).getSessionDir(sessionId));
         zkc.writeApplicationId(appId);
-        RemoteSession session = new RemoteSession(tenant, sessionId, componentRegistry, zkc);
+        RemoteSession session = new RemoteSession(tenant, sessionId, componentRegistry, zkc, Clock.systemUTC());
         server.reloadConfig(session.ensureApplicationLoaded());
     }
 
@@ -260,7 +263,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
     @Test
     public void testHasApplication() throws IOException, SAXException {
         assertdefaultAppNotFound();
-        server.reloadConfig(reloadConfig(1l));
+        server.reloadConfig(reloadConfig(1l, Clock.systemUTC()));
         assertTrue(server.hasApplication(new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build(), Optional.of(vespaVersion)));
     }
 
@@ -271,7 +274,7 @@ public class TenantRequestHandlerTest extends TestWithCurator {
     @Test
     public void testMultipleApplicationsReload() {
         assertdefaultAppNotFound();
-        server.reloadConfig(reloadConfig(1l, "foo"));
+        server.reloadConfig(reloadConfig(1l, "foo", Clock.systemUTC()));
         assertdefaultAppNotFound();
         assertTrue(server.hasApplication(new ApplicationId.Builder().tenant(tenant).applicationName("foo").build(),
                                          Optional.of(vespaVersion)));