diff --git a/akka-actor/src/main/scala/akka/AkkaApplication.scala b/akka-actor/src/main/scala/akka/AkkaApplication.scala
index 8dcd53cbdc..b2bcccb0b5 100644
--- a/akka-actor/src/main/scala/akka/AkkaApplication.scala
+++ b/akka-actor/src/main/scala/akka/AkkaApplication.scala
@@ -214,4 +214,6 @@ class AkkaApplication(val name: String, val config: Configuration) extends Actor
     guardian.stop()
   }
 
+  terminationFuture.onComplete(_ ⇒ dispatcher.shutdown())
+
 }
diff --git a/config/akka.test.conf b/config/akka.test.conf
index 8086557e01..4755e1f11f 100644
--- a/config/akka.test.conf
+++ b/config/akka.test.conf
@@ -9,7 +9,7 @@ akka {
   event-handler-level = "WARNING"
   actor {
     default-dispatcher {
-      core-pool-size = 8
+      core-pool-size = 4
       max-pool-size  = 32
     }
   }