diff --git a/src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs b/src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs
index 1f184ab6c62..abb96739751 100644
--- a/src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs
+++ b/src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs
@@ -42,7 +42,7 @@ protected override void AfterAll()
         public void LocalSnapshotStore_can_snapshot_actors_with_PersistenceId_containing_invalid_path_characters()
         {
             var pid = @"p\/:*?-1";
-            SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(pid, 1, Sys.Scheduler.DateTimeNow), "sample data"), TestActor);
+            SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(pid, 1, Sys.Scheduler.Now.DateTime), "sample data"), TestActor);
             ExpectMsg<SaveSnapshotSuccess>();
 
             SnapshotStore.Tell(new LoadSnapshot(pid, SnapshotSelectionCriteria.Latest, long.MaxValue), TestActor);
diff --git a/src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs b/src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs
index c62c0f5e214..43c69a42dff 100644
--- a/src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs
+++ b/src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs
@@ -247,8 +247,7 @@ protected IActorRef WriteSnapshot(string persistenceId, int n)
                 ExpectMsg($"{persistenceId}-{i}-done");
             }
 
-            var metadata = new SnapshotMetadata(persistenceId, n + 10, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(persistenceId, n + 10, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, $"s-{n}"), _senderProbe.Ref);
             _senderProbe.ExpectMsg<SaveSnapshotSuccess>();
 
diff --git a/src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs b/src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs
index b9575c77e3d..4d8c8fad5fa 100644
--- a/src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs
+++ b/src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs
@@ -69,8 +69,7 @@ public virtual void SnapshotStore_should_serialize_Payload()
 
             var snapshot = new Test.MySnapshot("a");
 
-            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, snapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -86,8 +85,7 @@ public virtual void SnapshotStore_should_serialize_Payload_with_string_manifest(
 
             var snapshot = new Test.MySnapshot2("a");
 
-            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, snapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -109,8 +107,7 @@ public virtual void SnapshotStore_should_serialize_AtLeastOnceDeliverySnapshot()
             };
             var atLeastOnceDeliverySnapshot = new AtLeastOnceDeliverySnapshot(17, unconfirmed);
 
-            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, atLeastOnceDeliverySnapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -126,8 +123,7 @@ public virtual void SnapshotStore_should_serialize_AtLeastOnceDeliverySnapshot_w
             var unconfirmed = Array.Empty<UnconfirmedDelivery>();
             var atLeastOnceDeliverySnapshot = new AtLeastOnceDeliverySnapshot(13, unconfirmed);
 
-            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, atLeastOnceDeliverySnapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -142,8 +138,7 @@ public virtual void SnapshotStore_should_serialize_PersistentFSMSnapshot()
 
             var persistentFSMSnapshot = new PersistentFSM.PersistentFSMSnapshot<string>("mystate", "mydata", TimeSpan.FromDays(4));
 
-            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, persistentFSMSnapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
diff --git a/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs b/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs
index 4b5f20599d7..035ae4a1ec4 100644
--- a/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs
+++ b/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs
@@ -138,16 +138,14 @@ public async Task MultipleSnapshotsWithSameSeqNo()
         var snapshotStore = persistence.SnapshotStoreFor(null);
         var snap = new TestPayload(SenderProbe.Ref);
         
-        var metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.UtcNow);
-        metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+        var metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.Now);
         snapshotStore.Tell(new SaveSnapshot(metadata, snap), SenderProbe);
         var success = await SenderProbe.ExpectMsgAsync<SaveSnapshotSuccess>(10.Minutes());
         success.Metadata.PersistenceId.Should().Be(metadata.PersistenceId);
         success.Metadata.Timestamp.Should().Be(metadata.Timestamp);
         success.Metadata.SequenceNr.Should().Be(metadata.SequenceNr);
         
-        metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.UtcNow);
-        metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+        metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.Now);
         snapshotStore.Tell(new SaveSnapshot(metadata, 3), SenderProbe);
         success = await SenderProbe.ExpectMsgAsync<SaveSnapshotSuccess>();
         success.Metadata.PersistenceId.Should().Be(metadata.PersistenceId);
diff --git a/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs b/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs
index 1efd1ab2514..68879cf8643 100644
--- a/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs
+++ b/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs
@@ -102,8 +102,7 @@ private IEnumerable<SnapshotMetadata> WriteSnapshots()
         {
             for (int i = 1; i <= 5; i++)
             {
-                var metadata = new SnapshotMetadata(Pid, i + 10, Sys.Scheduler.DateTimeNow);
-                metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+                var metadata = new SnapshotMetadata(Pid, i + 10, Sys.Scheduler.Now.DateTime);
                 SnapshotStore.Tell(new SaveSnapshot(metadata, $"s-{i}"), _senderProbe.Ref);
                 yield return _senderProbe.ExpectMsg<SaveSnapshotSuccess>().Metadata;
             }
@@ -313,8 +312,7 @@ public virtual void SnapshotStore_should_save_and_overwrite_snapshot_with_same_s
         [Fact]
         public virtual void SnapshotStore_should_save_bigger_size_snapshot()
         {
-            var metadata = new SnapshotMetadata(Pid, 100, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 100, Sys.Scheduler.Now.DateTime);
             var bigSnapshot = new byte[SnapshotByteSizeLimit];
             new Random().NextBytes(bigSnapshot);
             SnapshotStore.Tell(new SaveSnapshot(metadata, bigSnapshot), _senderProbe.Ref);
@@ -328,8 +326,7 @@ public virtual void ShouldSerializeSnapshots()
             if (!SupportsSerialization) return;
 
             var probe = CreateTestProbe();
-            var metadata = new SnapshotMetadata(Pid, 100L, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 100L, Sys.Scheduler.Now.DateTime);
             var snap = new TestPayload(probe.Ref);
 
             SnapshotStore.Tell(new SaveSnapshot(metadata, snap), _senderProbe.Ref);