diff --git a/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
index 2827ef72c9..ef13d3e8b0 100644
--- a/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -57,10 +57,13 @@ class FutureSpec extends JUnitSuite {
   @Test def shouldFutureCompose {
     val actor1 = actorOf[TestActor].start
     val actor2 = actorOf(new Actor { def receive = { case s: String => self reply s.toUpperCase } } ).start
-    val future1 = actor1.!!![Any]("Hello").flatMap{ case s: String => actor2.!!![Any](s) }
-    val future2 = actor1.!!![Any]("Hello").flatMap{ case s: Int => actor2.!!![Any](s) }
+    val future1 = actor1.!!![Any]("Hello") flatMap { case s: String => actor2.!!![Any](s) }
+    val future2 = actor1.!!![Any]("Hello") flatMap { case s: Int => actor2.!!![Any](s) }
+
+    println("'" + future2.await.exception.map(_.toString) + "'")
+
     assert(Some(Right("WORLD")) === future1.await.value)
-    assert(Some("scala.MatchError: World") === future2.await.exception.map(_.toString))
+    assert(Some("scala.MatchError: World (of class java.lang.String)") === future2.await.exception.map(_.toString))
     actor1.stop
     actor2.stop
   }
@@ -113,7 +116,7 @@ class FutureSpec extends JUnitSuite {
     } yield b + "-" + c
 
     assert(Some(Right("10-14")) === future1.await.value)
-    assert(Some("scala.MatchError: Res(10)") === future2.await.exception.map(_.toString))
+    assert("scala.MatchError: Res(10) (of class akka.actor.FutureSpec$Res$2)" === future2.await.exception.map(_.toString).get)
     actor.stop
   }
 
diff --git a/project/build.properties b/project/build.properties
index c5b83d798f..be1c7fa22f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -5,4 +5,4 @@ project.name=akka
 sbt.version=0.7.5.RC0
 project.version=1.1-SNAPSHOT
 def.scala.version=2.7.7
-build.scala.versions=2.8.1
+build.scala.versions=2.9.0-SNAPSHOT
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 7d278d5384..f15462e694 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -19,8 +19,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   val scalaCompileSettings =
     Seq("-deprecation",
         "-Xmigration",
-        //"-Xcheckinit",
-        //"-optimise",
+        "-Xcheckinit",
+        "-optimise",
         "-Xwarninit",
         "-encoding", "utf8")
 
@@ -102,9 +102,10 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val jerseyModuleConfig      = ModuleConfiguration("com.sun.jersey", JavaNetRepo)
   lazy val multiverseModuleConfig  = ModuleConfiguration("org.multiverse", CodehausRepo)
   lazy val nettyModuleConfig       = ModuleConfiguration("org.jboss.netty", JBossRepo)
-  lazy val scalaTestModuleConfig   = ModuleConfiguration("org.scalatest", ScalaToolsRelRepo)
+  lazy val scalaTestModuleConfig   = ModuleConfiguration("org.scalatest", ScalaToolsSnapshotRepo)
   lazy val spdeModuleConfig        = ModuleConfiguration("us.technically.spde", DatabinderRepo)
   lazy val processingModuleConfig  = ModuleConfiguration("org.processing", DatabinderRepo)
+  lazy val scalaModuleConfig       = ModuleConfiguration("org.scala-lang", ScalaToolsSnapshotRepo)
 
   // -------------------------------------------------------------------------------------------------------------------
   // Versions
@@ -113,7 +114,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val JACKSON_VERSION       = "1.7.1"
   lazy val JERSEY_VERSION        = "1.3"
   lazy val MULTIVERSE_VERSION    = "0.6.2"
-  lazy val SCALATEST_VERSION     = "1.3"
+  lazy val SCALATEST_VERSION     = "1.4-SNAPSHOT"
   lazy val JETTY_VERSION         = "7.1.6.v20100715"
   lazy val JAVAX_SERVLET_VERSION = "3.0"
 
@@ -382,6 +383,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   // Examples
   // -------------------------------------------------------------------------------------------------------------------
 
+  /** FIXME SPDE doesn't exist for 2.9.0-SNAPSHOT
   class AkkaSampleAntsProject(info: ProjectInfo) extends DefaultSpdeProject(info) {
     override def disableCrossPaths = true
     override def spdeSourcePath = mainSourcePath / "spde"
@@ -396,7 +398,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
       val releaseConfiguration = new DefaultPublishConfiguration(localReleaseRepository, "release", false)
       publishTask(publishIvyModule, releaseConfiguration) dependsOn (deliver, publishLocal, makePom)
     }
-  }
+  }*/
 
   class AkkaSampleRemoteProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath)
 
@@ -405,8 +407,9 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   class AkkaSamplesParentProject(info: ProjectInfo) extends ParentProject(info) {
     override def disableCrossPaths = true
 
-    lazy val akka_sample_ants = project("akka-sample-ants", "akka-sample-ants",
-      new AkkaSampleAntsProject(_), akka_stm)
+    //FIXME ANts is disabled due to unavailable for 2.9.0-SNAPSHOT
+   // lazy val akka_sample_ants = project("akka-sample-ants", "akka-sample-ants",
+    //  new AkkaSampleAntsProject(_), akka_stm)
     lazy val akka_sample_fsm = project("akka-sample-fsm", "akka-sample-fsm",
       new AkkaSampleFSMProject(_), akka_actor)
     lazy val akka_sample_remote = project("akka-sample-remote", "akka-sample-remote",