diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 15f5f44c6c..3318e62d05 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -549,7 +549,9 @@ object AkkaBuild extends Build {
 
     // -v Log "test run started" / "test started" / "test run finished" events on log level "info" instead of "debug".
     // -a Show stack traces and exception class name for AssertionErrors.
-    testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a")
+    testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
+
+    Dist.includeInDist := true
   ) ++
     mavenLocalResolverSettings ++
     JUnitFileReporting.settings ++
diff --git a/project/Dist.scala b/project/Dist.scala
index 761a382e7f..42ca1308b6 100644
--- a/project/Dist.scala
+++ b/project/Dist.scala
@@ -27,7 +27,6 @@ object Dist {
   val includeInDist = SettingKey[Boolean]("include-in-dist", "Include the artifact of this project in the standalone dist zip-file")
 
   lazy val settings: Seq[Setting[_]] = Seq(
-    includeInDist := true,
     distAllClasspaths <<= (thisProjectRef, buildStructure) flatMap aggregated(dependencyClasspath in Compile),
     distDependencies <<= distAllClasspaths map { _.flatten.map(_.data).filter(ClasspathUtilities.isArchive).distinct },
     distLibJars <<= (thisProjectRef, buildStructure) flatMap aggregated(packageBin in Compile),