diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java b/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java
index 884c11f92c..ef3bf68bc1 100644
--- a/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java
+++ b/akka-cluster-sharding-typed/src/test/java/jdocs/akka/cluster/sharding/typed/AccountExampleTest.java
@@ -32,7 +32,7 @@ public class AccountExampleTest extends JUnitSuite {
   public static final Config config =
       ConfigFactory.parseString(
           "akka.actor.provider = cluster \n"
-              + "akka.remote.netty.tcp.port = 0 \n"
+              + "akka.remote.classic.netty.tcp.port = 0 \n"
               + "akka.remote.artery.canonical.port = 0 \n"
               + "akka.remote.artery.canonical.hostname = 127.0.0.1 \n"
               + "akka.persistence.journal.plugin = \"akka.persistence.journal.inmem\" \n");
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala b/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala
index 730147c74e..c80ac1ecc4 100644
--- a/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/docs/akka/cluster/sharding/typed/AccountExampleSpec.scala
@@ -19,7 +19,7 @@ object AccountExampleSpec {
   val config = ConfigFactory.parseString("""
       akka.actor.provider = cluster
 
-      akka.remote.netty.tcp.port = 0
+      akka.remote.classic.netty.tcp.port = 0
       akka.remote.artery.canonical.port = 0
       akka.remote.artery.canonical.hostname = 127.0.0.1
 
diff --git a/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala
index 80988f0b76..920b6ce2b5 100644
--- a/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala
@@ -60,13 +60,13 @@ object UntrustedSpec {
 }
 
 class UntrustedSpec extends AkkaSpec("""
-                                        akka.loglevel = DEBUG
+akka.loglevel = DEBUG
 akka.actor.provider = remote
 akka.remote.artery.enabled = off
 akka.remote.warn-about-direct-use = off
 akka.remote.classic.untrusted-mode = on
 akka.remote.classic.trusted-selection-paths = ["/user/receptionist", ]    
-akka.remote.netty.tcp.port = 0
+akka.remote.classic.netty.tcp.port = 0
 akka.loglevel = DEBUG # test verifies debug
 """) with ImplicitSender {
 
@@ -75,7 +75,7 @@ akka.loglevel = DEBUG # test verifies debug
   val client = ActorSystem(
     "UntrustedSpec-client",
     ConfigFactory.parseString("""
-                                        akka.loglevel = DEBUG
+      akka.loglevel = DEBUG
       akka.actor.provider = remote
       akka.remote.artery.enabled = off
       akka.remote.warn-about-direct-use = off