diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 299207b868..3c4786ef15 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -440,6 +440,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     val junit      = Dependencies.junit
     val multiverse = Dependencies.multiverse
     val scalatest  = Dependencies.scalatest
+
+    override def testOptions = createTestFilter( _.endsWith("Test") )
   }
 
   // -------------------------------------------------------------------------------------------------------------------