diff --git a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala
index 227a29ddc2..94e59ebbf1 100644
--- a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala
+++ b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala
@@ -18,7 +18,7 @@ class Future2ActorSpec extends AkkaSpec {
       expectMsgAllOf(1 second, 42, 42)
     }
 
-    "support reply via channel" in {
+    "support reply via sender" in {
       val actor = app.actorOf(Props(new Actor {
         def receive = {
           case "do" ⇒ Future(31) pipeTo context.sender
diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
index 4c43e17d83..4861dd9ea5 100644
--- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
@@ -61,13 +61,13 @@ abstract class EventBusSpec(busName: String) extends AkkaSpec with BeforeAndAfte
       disposeSubscriber(sub)
     }
 
-    "not allow for the same subscriber to subscribe to the same sender twice" in {
+    "not allow for the same subscriber to subscribe to the same channel twice" in {
       bus.subscribe(subscriber, classifier) must be === true
       bus.subscribe(subscriber, classifier) must be === false
       bus.unsubscribe(subscriber, classifier) must be === true
     }
 
-    "not allow for the same subscriber to unsubscribe to the same sender twice" in {
+    "not allow for the same subscriber to unsubscribe to the same channel twice" in {
       bus.subscribe(subscriber, classifier) must be === true
       bus.unsubscribe(subscriber, classifier) must be === true
       bus.unsubscribe(subscriber, classifier) must be === false