diff --git a/akka-bench-jmh/src/main/scala/akka/aeron/AeronStreams.scala b/akka-bench-jmh/src/main/scala/akka/aeron/AeronStreams.scala
index e73d87c994..9857db6e69 100644
--- a/akka-bench-jmh/src/main/scala/akka/aeron/AeronStreams.scala
+++ b/akka-bench-jmh/src/main/scala/akka/aeron/AeronStreams.scala
@@ -17,6 +17,8 @@ import java.util.concurrent.CountDownLatch
 import java.util.concurrent.CyclicBarrier
 import java.util.concurrent.atomic.AtomicLongArray
 import akka.stream.ThrottleMode
+import akka.remote.artery.AeronSink
+import akka.remote.artery.AeronSource
 
 object AeronStreams {
 
diff --git a/akka-bench-jmh/src/main/scala/akka/aeron/AeronSink.scala b/akka-remote/src/main/scala/akka/remote/artery/AeronSink.scala
similarity index 99%
rename from akka-bench-jmh/src/main/scala/akka/aeron/AeronSink.scala
rename to akka-remote/src/main/scala/akka/remote/artery/AeronSink.scala
index c595075a43..c002695696 100644
--- a/akka-bench-jmh/src/main/scala/akka/aeron/AeronSink.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/AeronSink.scala
@@ -1,4 +1,4 @@
-package akka.aeron
+package akka.remote.artery
 
 import java.nio.ByteBuffer
 import java.util.concurrent.TimeUnit
diff --git a/akka-bench-jmh/src/main/scala/akka/aeron/AeronSource.scala b/akka-remote/src/main/scala/akka/remote/artery/AeronSource.scala
similarity index 99%
rename from akka-bench-jmh/src/main/scala/akka/aeron/AeronSource.scala
rename to akka-remote/src/main/scala/akka/remote/artery/AeronSource.scala
index 0a7ff3f6e1..a2bdaee683 100644
--- a/akka-bench-jmh/src/main/scala/akka/aeron/AeronSource.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/AeronSource.scala
@@ -1,4 +1,4 @@
-package akka.aeron
+package akka.remote.artery
 
 import java.nio.ByteBuffer
 import java.util.concurrent.TimeUnit
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index a2a08c475a..f0594b982e 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -107,7 +107,7 @@ object AkkaBuild extends Build {
     dependencies = Seq(
       actor,
       http, stream, streamTests,
-      persistence, distributedData,
+      remote, persistence, distributedData,
       testkit
     ).map(_ % "compile;compile->test;provided->provided")
   ).disablePlugins(ValidatePullRequest)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 65438b552c..b55dc7d954 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -129,7 +129,7 @@ object Dependencies {
 
   val actorTests = l ++= Seq(Test.junit, Test.scalatest.value, Test.commonsCodec, Test.commonsMath, Test.mockito, Test.scalacheck.value, Test.junitIntf)
 
-  val remote = l ++= Seq(netty, uncommonsMath, Test.junit, Test.scalatest.value)
+  val remote = l ++= Seq(netty, uncommonsMath, aeronDriver, aeronClient, Test.junit, Test.scalatest.value)
 
   val remoteTests = l ++= Seq(Test.junit, Test.scalatest.value, Test.scalaXml)
 
@@ -165,7 +165,7 @@ object Dependencies {
 
   val contrib = l ++= Seq(Test.junitIntf, Test.commonsIo)
 
-  val benchJmh = l ++= Seq(Provided.levelDB, Provided.levelDBNative, aeronDriver, aeronClient, hdrHistogram)
+  val benchJmh = l ++= Seq(Provided.levelDB, Provided.levelDBNative, hdrHistogram)
 
   // akka stream & http