diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
index dd8e31d4bf..a3eb6b609b 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
@@ -16,7 +16,7 @@ import akka.persistence.journal.EventSeq
  * INTERNAL API
  */
 @InternalApi
-final class OldCoordinatorStateMigrationEventAdapter extends EventAdapter {
+private[akka] final class OldCoordinatorStateMigrationEventAdapter extends EventAdapter {
   override def manifest(event: Any): String =
     ""
 
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
index b331202d9e..7303b5c409 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
@@ -404,7 +404,7 @@ private[akka] class Shard(
 
   import akka.cluster.sharding.ShardCoordinator.Internal.CoordinatorMessage
 
-  final val verboseDebug = context.system.settings.config.getBoolean("akka.cluster.sharding.verbose-debug-logging")
+  private val verboseDebug = context.system.settings.config.getBoolean("akka.cluster.sharding.verbose-debug-logging")
 
   private val rememberEntitiesStore: Option[ActorRef] =
     rememberEntitiesProvider.map { provider =>
diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala
index 293ab548ef..8331fc6527 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/CustomStateStoreModeProvider.scala
@@ -6,6 +6,7 @@ package akka.cluster.sharding.internal
 import akka.actor.ActorSystem
 import akka.actor.ExtendedActorSystem
 import akka.actor.Props
+import akka.annotation.InternalApi
 import akka.cluster.sharding.ClusterShardingSettings
 import akka.cluster.sharding.ShardRegion.ShardId
 import akka.event.Logging
@@ -15,6 +16,7 @@ import akka.event.Logging
  *
  * Only intended for testing, not an extension point.
  */
+@InternalApi
 private[akka] final class CustomStateStoreModeProvider(
     typeName: String,
     system: ActorSystem,