diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
index e8d68303a0..35cc9175bb 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
@@ -4,6 +4,8 @@
 
 package akka.cluster
 
+import language.postfixOps
+
 import akka.testkit.AkkaSpec
 import akka.util.duration._
 import akka.util.Duration
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
index 229ec7137d..104396e881 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
@@ -4,6 +4,9 @@
 
 package akka.cluster
 
+import language.postfixOps
+import language.reflectiveCalls
+
 import akka.testkit.AkkaSpec
 import akka.util.duration._
 import akka.util.Duration
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
index 979c274fa5..835bc272d9 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
@@ -216,7 +216,7 @@ private[akka] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress)
         case AddressReply(node, addr) ⇒
           runningOp match {
             case Some((_, requester)) ⇒ requester ! addr
-            case None ⇒ log.warning("did not expect {}", op)
+            case None                 ⇒ log.warning("did not expect {}", op)
           }
           stay using d.copy(runningOp = None)
         case t: ThrottleMsg ⇒