diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index f9c6430f6f..76f1980615 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -61,23 +61,23 @@ akka {
     # it reuses inbound connections for replies, which is called a passive client connection (i.e. from server
     # to client).
     netty {
-      
+
       # (O) In case of increased latency / overflow how long
       # should we wait (blocking the sender) until we deem the send to be cancelled?
       # 0 means "never backoff", any positive number will indicate time to block at most.
       backoff-timeout = 0ms
-  
+
       # (I&O) Generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh'
       #     or using 'akka.util.Crypt.generateSecureCookie'
       secure-cookie = ""
-  
+
       # (I) Should the remote server require that it peers share the same secure-cookie
       # (defined in the 'remote' section)?
       require-cookie = off
 
       # (I) Reuse inbound connections for outbound messages
       use-passive-connections = on
-  
+
       # (I) The hostname or ip to bind the remoting to,
       # InetAddress.getLocalHost.getHostAddress is used if empty
       hostname = ""
@@ -118,19 +118,6 @@ akka {
       reconnection-time-window = 600s
     }
 
-    # accrual failure detection config
-    failure-detector {
-
-      # defines the failure detector threshold
-      #     A low threshold is prone to generate many wrong suspicions but ensures
-      #     a quick detection in the event of a real crash. Conversely, a high
-      #     threshold generates fewer mistakes but needs more time to detect
-      #     actual crashes
-      threshold = 8
-
-      max-sample-size = 1000
-    }
-
     # The dispatcher used for remote system messages
     compute-grid-dispatcher {
       # defaults to same settings as default-dispatcher
@@ -146,9 +133,24 @@ akka {
 
   cluster {
     use-cluster = off
+
     seed-nodes = []
-    max-time-to-retry-joining-cluster = 30s
     seed-node-connection-timeout = 30s
+    max-time-to-retry-joining-cluster = 30s
+
+    # accrual failure detection config
+    failure-detector {
+
+      # defines the failure detector threshold
+      #     A low threshold is prone to generate many wrong suspicions but ensures
+      #     a quick detection in the event of a real crash. Conversely, a high
+      #     threshold generates fewer mistakes but needs more time to detect
+      #     actual crashes
+      threshold = 8
+
+      max-sample-size = 1000
+    }
+
     gossip {
       initialDelay = 5s
       frequency = 1s
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 84428d739b..0060233246 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
@@ -20,13 +20,11 @@ class RemoteSettings(val config: Config, val systemName: String) {
   val LogReceive = getBoolean("akka.remote.log-received-messages")
   val LogSend = getBoolean("akka.remote.log-sent-messages")
 
-  // AccrualFailureDetector
-  val FailureDetectorThreshold = getInt("akka.remote.failure-detector.threshold")
-  val FailureDetectorMaxSampleSize = getInt("akka.remote.failure-detector.max-sample-size")
-
   // TODO cluster config will go into akka-cluster/reference.conf when we enable that module
   // cluster config section
   val UseCluster = getBoolean("akka.cluster.use-cluster")
+  val FailureDetectorThreshold = getInt("akka.cluster.failure-detector.threshold")
+  val FailureDetectorMaxSampleSize = getInt("akka.cluster.failure-detector.max-sample-size")
   val SeedNodeConnectionTimeout = Duration(config.getMilliseconds("akka.cluster.seed-node-connection-timeout"), MILLISECONDS)
   val MaxTimeToRetryJoiningCluster = Duration(config.getMilliseconds("akka.cluster.max-time-to-retry-joining-cluster"), MILLISECONDS)
   val InitialDelayForGossip = Duration(getMilliseconds("akka.cluster.gossip.initialDelay"), MILLISECONDS)