diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
index cffa864f27..f1c05a2752 100644
--- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
+++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
@@ -3,7 +3,7 @@ package akka.cluster.pubsub
 import akka.testkit._
 import akka.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope }
 import org.scalatest.WordSpecLike
-import akka.actor.{DeadLetter, ActorRef}
+import akka.actor.{ DeadLetter, ActorRef }
 import com.typesafe.config.ConfigFactory
 
 case class WrappedMessage(msg: String) extends RouterEnvelope {
diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/RouteDirectivesExamplesSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/RouteDirectivesExamplesSpec.scala
index f4379d402a..be19949343 100644
--- a/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/RouteDirectivesExamplesSpec.scala
+++ b/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/RouteDirectivesExamplesSpec.scala
@@ -7,7 +7,7 @@ package docs.http.scaladsl.server.directives
 import akka.http.scaladsl.model.ContentTypes._
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers.`Content-Type`
-import akka.http.scaladsl.server.{Route, ValidationRejection}
+import akka.http.scaladsl.server.{ Route, ValidationRejection }
 import akka.testkit.EventFilter
 import docs.http.scaladsl.server.RoutingSpec
 
diff --git a/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala b/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala
index 95455e4599..6097220af2 100644
--- a/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/stream/TwitterStreamQuickstartDocSpec.scala
@@ -31,12 +31,13 @@ object TwitterStreamQuickstartDocSpec {
   val akka = Hashtag("#akka")
   //#model
 
-  // format: OFF
-  //#tweet-source
-  val tweets: Source[Tweet, NotUsed]
-  //#tweet-source
-  // format: ON
-  = Source(
+  abstract class TweetSourceDecl {
+    //#tweet-source
+    val tweets: Source[Tweet, NotUsed]
+    //#tweet-source
+  }
+
+  val tweets: Source[Tweet, NotUsed] = Source(
     Tweet(Author("rolandkuhn"), System.currentTimeMillis, "#akka rocks!") ::
       Tweet(Author("patriknw"), System.currentTimeMillis, "#akka !") ::
       Tweet(Author("bantonsson"), System.currentTimeMillis, "#akka !") ::
diff --git a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala b/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala
index 3234d0744a..2022b1d1dc 100644
--- a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala
+++ b/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala
@@ -444,7 +444,7 @@ object PersistentFSMSpec {
             reportActor ! ShoppingCardDiscarded
             saveStateSnapshot()
         }
-        //#customer-snapshot-example
+      //#customer-snapshot-example
       case Event(GetCurrentCart, data) ⇒
         stay replying data
       case Event(StateTimeout, _) ⇒
diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala
index a88fc8f0f4..32272fed9a 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala
@@ -133,7 +133,7 @@ class TimeoutsSpec extends AkkaSpec {
   "BackpressureTimeout" must {
 
     "pass through elements unmodified" in assertAllStagesStopped {
-      Await.result(Source(1 to 100).backpressureTimeout(1.second).grouped(200).runWith(Sink.head), 3.seconds) should === (1 to 100)
+      Await.result(Source(1 to 100).backpressureTimeout(1.second).grouped(200).runWith(Sink.head), 3.seconds) should ===(1 to 100)
     }
 
     "succeed if subscriber demand arrives" in assertAllStagesStopped {
@@ -203,7 +203,7 @@ class TimeoutsSpec extends AkkaSpec {
 
       Thread.sleep(3000)
 
-      subscriber.expectError().getMessage should === ("No demand signalled in the last 1 second.")
+      subscriber.expectError().getMessage should ===("No demand signalled in the last 1 second.")
     }
 
     "throw if subscriber never generate demand" in assertAllStagesStopped {
@@ -218,7 +218,7 @@ class TimeoutsSpec extends AkkaSpec {
 
       Thread.sleep(3000)
 
-      subscriber.expectError().getMessage should === ("No demand signalled in the last 1 second.")
+      subscriber.expectError().getMessage should ===("No demand signalled in the last 1 second.")
     }
 
     "not throw if publisher completes without fulfilling subscriber's demand" in assertAllStagesStopped {