diff --git a/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala b/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala
index cc77e7631a..5aad271beb 100644
--- a/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/stream/io/StreamTcpDocSpec.scala
@@ -38,13 +38,12 @@ class StreamTcpDocSpec extends AkkaSpec {
       //#echo-server-simple-bind
     }
     {
-      val localhost = TestUtils.temporaryServerAddress()
-      val connections: Source[IncomingConnection, Future[ServerBinding]] =
-        Tcp().bind(localhost.getHostName, localhost.getPort) // TODO getHostString in Java7
-
+      val (host, port) = TestUtils.temporaryServerHostnameAndPort()
       //#echo-server-simple-handle
       import akka.stream.io.Framing
 
+      val connections: Source[IncomingConnection, Future[ServerBinding]] =
+        Tcp().bind(host, port)
       connections runForeach { connection =>
         println(s"New connection from: ${connection.remoteAddress}")
 
diff --git a/akka-docs-dev/rst/scala/code/docs/utils/TestUtils.scala b/akka-docs-dev/rst/scala/code/docs/utils/TestUtils.scala
index 5ffc5febf8..41b6df832a 100644
--- a/akka-docs-dev/rst/scala/code/docs/utils/TestUtils.scala
+++ b/akka-docs-dev/rst/scala/code/docs/utils/TestUtils.scala
@@ -19,6 +19,6 @@ object TestUtils {
 
   def temporaryServerHostnameAndPort(interface: String = "127.0.0.1"): (String, Int) = {
     val socketAddress = temporaryServerAddress(interface)
-    socketAddress.getHostName -> socketAddress.getPort
+    socketAddress.getHostName -> socketAddress.getPort  // TODO getHostString in Java7
   }
 }