diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index 89fa807762..643bc68cdb 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -397,7 +397,7 @@ private[akka] class Controller(private var initialParticipants: Int, controllerP
   override def receive = LoggingReceive {
     case CreateServerFSM(channel) ⇒
       val (ip, port) = channel.getRemoteAddress match {
-        case s: InetSocketAddress ⇒ (s.getHostString, s.getPort)
+        case s: InetSocketAddress ⇒ (s.getHostName, s.getPort)
       }
       val name = ip + ":" + port + "-server" + generation.next
       sender ! context.actorOf(Props(new ServerFSM(self, channel)), name)
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/NetworkFailureInjector.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/NetworkFailureInjector.scala
index ba8f8d1285..b425518044 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/NetworkFailureInjector.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/NetworkFailureInjector.scala
@@ -135,7 +135,7 @@ private[akka] object NetworkFailureInjector {
 }
 
 /**
- * Brief overview: all network traffic passes through the `sender`/`receiver` FSMs managed 
+ * Brief overview: all network traffic passes through the `sender`/`receiver` FSMs managed
  * by the FailureInjector of the TestConductor extension. These can
  * pass through requests immediately, drop them or throttle to a desired rate. The FSMs are
  * registered in the TestConductorExt.failureInjector so that settings can be applied from