diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 92682fa2c6..1bf388d3fc 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -13,7 +13,6 @@ import sbtassembly.AssemblyPlugin.autoImport._
 import sbt.Keys._
 import sbt._
 import JdkOptions.autoImport._
-import scala.collection.breakOut
 
 object AkkaBuild {
 
@@ -211,11 +210,14 @@ object AkkaBuild {
         .ifTrue(jvmGCLogOptions(JdkOptions.isJdk11orHigher, JdkOptions.isJdk8))
         .getOrElse(Nil)
     },
-    // all system properties passed to sbt prefixed with "akka." will be passed on to the forked jvms as is
+    // all system properties passed to sbt prefixed with "akka." or "aeron." will be passed on to the forked jvms as is
     Test / javaOptions := {
       val base = (Test / javaOptions).value
+      val knownPrefix = Set("akka.", "aeron.")
       val akkaSysProps: Seq[String] =
-        sys.props.filter(_._1.startsWith("akka")).map { case (key, value) => s"-D$key=$value" }(breakOut)
+        sys.props.iterator.collect {
+          case (key, value) if knownPrefix.exists(pre => key.startsWith(pre)) => s"-D$key=$value"
+        }.toList
 
       base ++ akkaSysProps
     },
diff --git a/project/MultiNode.scala b/project/MultiNode.scala
index 61a1618d6d..fe19212c9f 100644
--- a/project/MultiNode.scala
+++ b/project/MultiNode.scala
@@ -51,7 +51,7 @@ object MultiNode extends AutoPlugin {
     // -Dmultinode.Djava.net.preferIPv4Stack=true -Dmultinode.Xmx512m -Dmultinode.XX:MaxPermSize=256M
     // -DMultiJvm.akka.cluster.Stress.nrOfNodes=15
     val MultinodeJvmArgs = "multinode\\.(D|X)(.*)".r
-    val knownPrefix = Set("akka.", "MultiJvm.")
+    val knownPrefix = Set("akka.", "MultiJvm.", "aeron.")
     val akkaProperties = System.getProperties.stringPropertyNames.asScala.toList.collect {
       case MultinodeJvmArgs(a, b) =>
         val value = System.getProperty("multinode." + a + b)