diff --git a/charger/ocpp/cp_core.go b/charger/ocpp/cp_core.go
index ccbe6a825..0ebc7aab0 100644
--- a/charger/ocpp/cp_core.go
+++ b/charger/ocpp/cp_core.go
@@ -26,7 +26,7 @@ func (cp *CP) Authorize(request *core.AuthorizeRequest) (*core.AuthorizeConfirma
 
 func (cp *CP) BootNotification(request *core.BootNotificationRequest) (*core.BootNotificationConfirmation, error) {
 	res := &core.BootNotificationConfirmation{
-		CurrentTime: types.NewDateTime(time.Now()),
+		CurrentTime: types.NewDateTime(cp.clock.Now()),
 		Interval:    60, // TODO
 		Status:      core.RegistrationStatusAccepted,
 	}
@@ -78,7 +78,7 @@ func (cp *CP) DataTransfer(request *core.DataTransferRequest) (*core.DataTransfe
 
 func (cp *CP) Heartbeat(request *core.HeartbeatRequest) (*core.HeartbeatConfirmation, error) {
 	res := &core.HeartbeatConfirmation{
-		CurrentTime: types.NewDateTime(time.Now()),
+		CurrentTime: types.NewDateTime(cp.clock.Now()),
 	}
 
 	return res, nil
@@ -94,7 +94,7 @@ func (cp *CP) MeterValues(request *core.MeterValuesRequest) (*core.MeterValuesCo
 			if meterValue.Timestamp.Time.After(cp.meterUpdated) {
 				for _, sample := range meterValue.SampledValue {
 					cp.measurements[getSampleKey(sample)] = sample
-					cp.meterUpdated = time.Now()
+					cp.meterUpdated = cp.clock.Now()
 				}
 			}
 		}