diff --git a/akka-http/src/main/scala/Mist.scala b/akka-http/src/main/scala/Mist.scala
index 91c528e108..3cc5faa40b 100644
--- a/akka-http/src/main/scala/Mist.scala
+++ b/akka-http/src/main/scala/Mist.scala
@@ -315,7 +315,7 @@ class RootEndpoint extends Actor with Endpoint {
 
 /**
  * Basic description of the suspended async http request.
- * 	Must be mixed with some kind of specific support (e.g. servlet 3.0 or jetty continuations)
+ *      Must be mixed with some kind of specific support (e.g. servlet 3.0 or jetty continuations)
  *
  * @author Garrick Evans
  */
@@ -360,8 +360,8 @@ trait RequestMethod extends Logging
   def getHeaderOrElse(name: String, default: Function[Any, String]): String =
     request.getHeader(name) match {
       case null => default(null)
-	    case s => s
-	  }
+            case s => s
+          }
 
   def getParameterOrElse(name: String, default: Function[Any, String]): String =
     request.getParameter(name) match {
diff --git a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteSessionActorSpec.scala b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteSessionActorSpec.scala
index 173898c1fe..982fc3e642 100644
--- a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteSessionActorSpec.scala
+++ b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteSessionActorSpec.scala
@@ -42,7 +42,7 @@ object ServerInitiatedRemoteSessionActorSpec {
 
     def receive = {
       case Login(user) =>
-	      this.user = user
+              this.user = user
       case GetUser() =>
         self.reply(this.user)
       case DoSomethingFunny() =>