diff --git a/src/contrib/persistence/Akka.Persistence.SqlServer/Snapshot/QueryBuilder.cs b/src/contrib/persistence/Akka.Persistence.SqlServer/Snapshot/QueryBuilder.cs
index 6376f3a2403..f3e9d345691 100644
--- a/src/contrib/persistence/Akka.Persistence.SqlServer/Snapshot/QueryBuilder.cs
+++ b/src/contrib/persistence/Akka.Persistence.SqlServer/Snapshot/QueryBuilder.cs
@@ -97,7 +97,7 @@ public DbCommand SelectSnapshot(string persistenceId, long maxSequenceNr, DateTi
 
             if (maxTimestamp > DateTime.MinValue && maxTimestamp < DateTime.MaxValue)
             {
-                sb.Append(" AND SequenceNr <= @SequenceNr ");
+                sb.Append(" AND Timestamp <= @Timestamp ");
                 sqlCommand.Parameters.Add(new SqlParameter("@Timestamp", SqlDbType.DateTime2) { Value = maxTimestamp });
             }
 
diff --git a/src/core/Akka.Persistence.TestKit/PluginSpec.cs b/src/core/Akka.Persistence.TestKit/PluginSpec.cs
index a765e99ff89..740b927d37d 100644
--- a/src/core/Akka.Persistence.TestKit/PluginSpec.cs
+++ b/src/core/Akka.Persistence.TestKit/PluginSpec.cs
@@ -16,7 +16,7 @@ namespace Akka.Persistence.TestKit
 {
     public abstract class PluginSpec : TestKitBase, IDisposable
     {
-        private readonly AtomicCounter _counter = new AtomicCounter(0);
+        private static readonly AtomicCounter Counter = new AtomicCounter(0);
         private readonly PersistenceExtension _extension;
         private string _pid;
 
@@ -26,7 +26,7 @@ protected PluginSpec(Config config = null, string actorSystemName = null, string
             : base(new XunitAssertions(), FromConfig(config), actorSystemName, testActorName)
         {
             _extension = Persistence.Instance.Apply(Sys as ExtendedActorSystem);
-            _pid = "p-" + _counter.IncrementAndGet();
+            _pid = "p-" + Counter.IncrementAndGet();
         }
 
         protected static Config FromConfig(Config config = null)