diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml
index 0dd2905b3e..ac4608bbde 100644
--- a/.github/workflows/scala3-build.yml
+++ b/.github/workflows/scala3-build.yml
@@ -23,7 +23,7 @@ jobs:
           - akka-bench-jmh/test
           - akka-cluster/test akka-cluster-tools/test akka-cluster-typed/test akka-distributed-data/test akka-cluster-metrics/test akka-cluster-sharding/test akka-cluster-sharding-typed/test
           - akka-discovery/test akka-coordination/test
-          - akka-persistence/test akka-persistence-shared/test akka-persistence-query/test akka-persistence-typed/test akka-persistence-testkit/test
+          - akka-persistence/test akka-persistence-shared/test akka-persistence-query/test akka-persistence-typed/test akka-persistence-testkit/test akka-persistence-tck/test akka-persistence-typed-tests/test
           - akka-pki/test akka-slf4j/test
           - akka-serialization-jackson/test
           - akka-stream/test akka-stream-testkit/test akka-stream-tests/test akka-stream-typed/test
diff --git a/.github/workflows/scala3-compile.yml b/.github/workflows/scala3-compile.yml
index 412e037192..8a33a7af5e 100644
--- a/.github/workflows/scala3-compile.yml
+++ b/.github/workflows/scala3-compile.yml
@@ -21,7 +21,7 @@ jobs:
           - akka-bench-jmh/Test/compile
           - akka-cluster/Test/compile akka-cluster-tools/Test/compile akka-cluster-typed/Test/compile akka-distributed-data/Test/compile akka-cluster-metrics/Test/compile akka-cluster-sharding/Test/compile akka-cluster-sharding-typed/Test/compile
           - akka-discovery/Test/compile akka-coordination/Test/compile
-          - akka-persistence/Test/compile akka-persistence-shared/Test/compile akka-persistence-query/Test/compile akka-persistence-typed/Test/compile akka-persistence-testkit/Test/compile
+          - akka-persistence/Test/compile akka-persistence-shared/Test/compile akka-persistence-query/Test/compile akka-persistence-typed/Test/compile akka-persistence-testkit/Test/compile akka-persistence-tck/Test/compile akka-persistence-typed-tests/Test/compile
           - akka-pki/Test/compile akka-slf4j/Test/compile
           - akka-serialization-jackson/Test/compile
           - akka-stream/Test/compile akka-stream-testkit/Test/compile akka-stream-tests/Test/compile akka-stream-typed/Test/compile
diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala b/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala
index 3fa67083bd..8ac9dd5855 100644
--- a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala
+++ b/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala
@@ -9,7 +9,7 @@ import java.io.File
 import org.apache.commons.io.FileUtils
 import org.scalatest.BeforeAndAfterAll
 
-trait PluginCleanup extends BeforeAndAfterAll { _: PluginSpec =>
+trait PluginCleanup extends BeforeAndAfterAll { self: PluginSpec =>
   val storageLocations =
     List("akka.persistence.journal.leveldb.dir", "akka.persistence.snapshot-store.local.dir").map(s =>
       new File(system.settings.config.getString(s)))
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala b/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
index b0547f7e9f..a500f5023d 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/jackson/ReplicatedEventSourcingJacksonSpec.scala
@@ -15,13 +15,13 @@ import org.scalatest.wordspec.AnyWordSpecLike
 object ReplicatedEventSourcingJacksonSpec {
   final case class WithLwwTime(lwwTime: LwwTime) extends JsonSerializable
   final case class WithOrSet(
-      @JsonDeserialize(using = classOf[AkkaSerializationDeserializer])
-      @JsonSerialize(using = classOf[AkkaSerializationSerializer])
+      @JsonDeserialize(`using` = classOf[AkkaSerializationDeserializer])
+      @JsonSerialize(`using` = classOf[AkkaSerializationSerializer])
       orSet: ORSet[String])
       extends JsonSerializable
   final case class WithCounter(
-      @JsonDeserialize(using = classOf[AkkaSerializationDeserializer])
-      @JsonSerialize(using = classOf[AkkaSerializationSerializer])
+      @JsonDeserialize(`using` = classOf[AkkaSerializationDeserializer])
+      @JsonSerialize(`using` = classOf[AkkaSerializationSerializer])
       counter: Counter)
       extends JsonSerializable
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala b/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
index 78bbe3212b..273f7ee37a 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedStashOverflowSpec.scala
@@ -76,7 +76,8 @@ class EventSourcedStashOverflowSpec
       // capacity + 1 should mean that we get a dropped last message when all stash is filled
       // while the actor is stuck in replay because journal isn't responding
       droppedMessageProbe.receiveMessage()
-      implicit val classicSystem = testKit.system.toClassic
+      implicit val classicSystem: akka.actor.ActorSystem =
+        testKit.system.toClassic
       // we only need to do this one step and recovery completes
       SteppingInmemJournal.step(journal)
 
diff --git a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala b/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
index d683259151..e37313c937 100644
--- a/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/state/scaladsl/DurableStateBehaviorReplySpec.scala
@@ -31,7 +31,7 @@ object DurableStateBehaviorReplySpec {
   final case class IncrementReplyLater(replyTo: ActorRef[Done]) extends Command[Done]
   final case class ReplyNow(replyTo: ActorRef[Done]) extends Command[Done]
   final case class GetValue(replyTo: ActorRef[State]) extends Command[State]
-  final case object Increment extends Command[Nothing]
+  case object Increment extends Command[Nothing]
   case class IncrementBy(by: Int) extends Command[Nothing]
 
   final case class State(value: Int) extends CborSerializable
diff --git a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala b/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala
index 92f1d563a8..5852d44309 100644
--- a/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala
+++ b/akka-persistence-typed-tests/src/test/scala/docs/akka/persistence/typed/ReplicatedAuctionExampleSpec.scala
@@ -47,7 +47,7 @@ object ReplicatedAuctionExampleSpec {
     final case class OfferBid(bidder: String, offer: MoneyAmount) extends Command
     final case class GetHighestBid(replyTo: ActorRef[Bid]) extends Command
     final case class IsClosed(replyTo: ActorRef[Boolean]) extends Command
-    private final case object Close extends Command // Internal, should not be sent from the outside
+    private case object Close extends Command // Internal, should not be sent from the outside
     //#commands
 
     //#events