diff --git a/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala b/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala
index 48c271bd8a..ee83a4df0c 100644
--- a/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala
+++ b/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala
@@ -48,7 +48,7 @@ class PerformanceSpec extends TypedSpec {
             } ping ! Ping(count, pong, ctx.self)
 
             start
-          }.expectMultipleMessages(15.seconds, pairs * pings) { (msgs, start) ⇒
+          }.expectMultipleMessages(60.seconds, pairs * pings) { (msgs, start) ⇒
             val stop = Deadline.now
 
             val rate = 2L * count * pairs * pings / (stop - start).toMillis
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index d50a745518..10c7fa7128 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -54,7 +54,7 @@ object AkkaBuild extends Build {
       }
     ),
     aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, clusterMetrics, slf4j, agent,
-      persistence, persistenceTck, kernel, osgi, docs, contrib, samples, multiNodeTestkit)
+      persistence, persistenceTck, kernel, osgi, docs, contrib, samples, multiNodeTestkit, typed)
   )
 
   lazy val akkaScalaNightly = Project(
@@ -63,7 +63,7 @@ object AkkaBuild extends Build {
     // remove dependencies that we have to build ourselves (Scala STM)
     // samples don't work with dbuild right now
     aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, slf4j,
-      persistence, persistenceTck, kernel, osgi, contrib, multiNodeTestkit)
+      persistence, persistenceTck, kernel, osgi, contrib, multiNodeTestkit, typed)
   ).disablePlugins(ValidatePullRequest)
 
   lazy val actor = Project(