diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala
index c841cf216d..a24262cc67 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala
@@ -93,7 +93,7 @@ class DispatcherActorSpec extends JUnitSuite {
     (1 to 100) foreach { _ ⇒ slowOne ! "ping" }
     fastOne ! "sabotage"
     start.countDown()
-    val result = latch.await(3, TimeUnit.SECONDS)
+    val result = latch.await(5, TimeUnit.SECONDS)
     fastOne.stop()
     slowOne.stop()
     assert(result === true)
diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java b/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java
index 541f64da95..bfe6dad361 100644
--- a/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java
+++ b/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java
@@ -8,5 +8,5 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 abstract class AbstractMailbox {
     private volatile int _status = Mailbox.Idle();
-    protected static AtomicIntegerFieldUpdater<AbstractMailbox> updater = AtomicIntegerFieldUpdater.newUpdater(AbstractMailbox.class, "_status");
+    protected final static AtomicIntegerFieldUpdater<AbstractMailbox> updater = AtomicIntegerFieldUpdater.newUpdater(AbstractMailbox.class, "_status");
 }
\ No newline at end of file