diff --git a/akka-actor/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor/src/test/scala/akka/config/ConfigSpec.scala
index 4a4847e3eb..c7a574a7f0 100644
--- a/akka-actor/src/test/scala/akka/config/ConfigSpec.scala
+++ b/akka-actor/src/test/scala/akka/config/ConfigSpec.scala
@@ -17,7 +17,6 @@ class ConfigSpec extends WordSpec with MustMatchers {
       import Config.config._
 
       getList("akka.boot") must equal(Nil)
-      getBool("akka.default-error-handler") must equal(Some(true))
       getString("akka.time-unit") must equal(Some("seconds"))
       getString("akka.version") must equal(Some("1.1-SNAPSHOT"))
 
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteShared.scala b/akka-remote/src/main/scala/akka/remote/RemoteShared.scala
index cb52129007..0ae5971866 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteShared.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteShared.scala
@@ -14,7 +14,7 @@ object RemoteClientSettings {
     case cookie => Some(cookie)
   }
   val RECONNECTION_TIME_WINDOW = Duration(config.getInt("akka.remote.client.reconnection-time-window", 600), TIME_UNIT).toMillis
-  val READ_TIMEOUT       = Duration(config.getInt("akka.remote.client.read-timeout", 1), TIME_UNIT)
+  val READ_TIMEOUT       = Duration(config.getInt("akka.remote.client.read-timeout", 10), TIME_UNIT)
   val RECONNECT_DELAY    = Duration(config.getInt("akka.remote.client.reconnect-delay", 5), TIME_UNIT)
   val REAP_FUTURES_DELAY = Duration(config.getInt("akka.remote.client.reap-futures-delay", 5), TIME_UNIT)
   val MESSAGE_FRAME_SIZE = config.getInt("akka.remote.client.message-frame-size", 1048576)
diff --git a/akka-remote/src/test/scala/config/ConfigSpec.scala b/akka-remote/src/test/scala/config/ConfigSpec.scala
index 1a54b06204..0000310882 100644
--- a/akka-remote/src/test/scala/config/ConfigSpec.scala
+++ b/akka-remote/src/test/scala/config/ConfigSpec.scala
@@ -17,7 +17,7 @@ class ConfigSpec extends WordSpec with MustMatchers {
       import Config.config._
 
       getInt("akka.remote.client.message-frame-size") must equal(Some(1048576))
-      getInt("akka.remote.client.read-timeout") must equal(Some(1))
+      getInt("akka.remote.client.read-timeout") must equal(Some(10))
       getInt("akka.remote.client.reap-futures-delay") must equal(Some(5))
       getInt("akka.remote.client.reconnect-delay") must equal(Some(5))
       getInt("akka.remote.client.reconnection-time-window") must equal(Some(600))
diff --git a/akka-stm/src/main/scala/akka/stm/TransactionFactory.scala b/akka-stm/src/main/scala/akka/stm/TransactionFactory.scala
index 8d888b9c80..0bb0caa494 100644
--- a/akka-stm/src/main/scala/akka/stm/TransactionFactory.scala
+++ b/akka-stm/src/main/scala/akka/stm/TransactionFactory.scala
@@ -23,7 +23,7 @@ object TransactionConfig {
   val FAMILY_NAME      = "DefaultTransaction"
   val READONLY         = null.asInstanceOf[JBoolean]
   val MAX_RETRIES      = config.getInt("akka.stm.max-retries", 1000)
-  val TIMEOUT          = config.getLong("akka.stm.timeout", 10)
+  val TIMEOUT          = config.getLong("akka.stm.timeout", 5)
   val TRACK_READS      = null.asInstanceOf[JBoolean]
   val WRITE_SKEW       = config.getBool("akka.stm.write-skew", true)
   val BLOCKING_ALLOWED = config.getBool("akka.stm.blocking-allowed", false)
diff --git a/akka-stm/src/test/scala/config/ConfigSpec.scala b/akka-stm/src/test/scala/config/ConfigSpec.scala
index 7a50b64f0f..69f76eb89b 100644
--- a/akka-stm/src/test/scala/config/ConfigSpec.scala
+++ b/akka-stm/src/test/scala/config/ConfigSpec.scala
@@ -27,7 +27,7 @@ class ConfigSpec extends WordSpec with MustMatchers {
       getString("akka.stm.propagation") must equal(Some("requires"))
       getBool("akka.stm.quick-release") must equal(Some(true))
       getBool("akka.stm.speculative") must equal(Some(true))
-      getLong("akka.stm.timeout") must equal(Some(10))
+      getLong("akka.stm.timeout") must equal(Some(5))
       getString("akka.stm.trace-level") must equal(Some("none"))
       getBool("akka.stm.write-skew") must equal(Some(true))
     }
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 114a9918fd..d4366407ba 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -61,7 +61,7 @@ akka {
   stm {
     fair             = on     # Should global transactions be fair or non-fair (non fair yield better performance)
     max-retries      = 1000
-    timeout          = 10     # Default timeout for blocking transactions and transaction set (in unit defined by
+    timeout          = 5      # Default timeout for blocking transactions and transaction set (in unit defined by
                               #     the time-unit property)
     write-skew       = true
     blocking-allowed = false
@@ -145,7 +145,7 @@ akka {
 
     client {
       reconnect-delay = 5
-      read-timeout = 1
+      read-timeout = 10
       message-frame-size = 1048576
       reap-futures-delay = 5
       reconnection-time-window = 600 # Maximum time window that a client should try to reconnect for