diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index bcbff6d439..dbef02b9c0 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -60,13 +60,13 @@ akka {
     # Timeout after which the startup of the remoting subsystem is considered to be failed.
     # Increase this value if your transport drivers (see the enabled-transports section)
     # need longer time to be loaded.
-    startup-timeout = 5 s
+    startup-timeout = 10 s
 
     # Timout after which the graceful shutdown of the remoting subsystem is considered to be failed.
     # After the timeout the remoting system is forcefully shut down.
     # Increase this value if your transport drivers (see the enabled-transports section)
     # need longer time to stop properly.
-    shutdown-timeout = 5 s
+    shutdown-timeout = 10 s
 
     # Before shutting down the drivers, the remoting subsystem attempts to flush all pending
     # writes. This setting controls the maximum time the remoting is willing to wait before
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index 23c301b6ed..5525af3200 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -25,8 +25,8 @@ class RemoteConfigSpec extends AkkaSpec(
       val settings = RARP(system).provider.remoteSettings
       import settings._
 
-      StartupTimeout must be === Timeout(5.seconds)
-      ShutdownTimeout must be === Timeout(5.seconds)
+      StartupTimeout must be === Timeout(10.seconds)
+      ShutdownTimeout must be === Timeout(10.seconds)
       FlushWait must be === 2.seconds
       UsePassiveConnections must be(true)
       UntrustedMode must be(false)