diff --git a/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala b/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala
index 7de701d4f0..81fb4780da 100644
--- a/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala
+++ b/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala
@@ -9,47 +9,46 @@ import org.junit.{Test, Before, After}
 import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
 import se.scalablesolutions.akka.dispatch.Dispatchers
 
-object ClientInitiatedRemoteActorTest {
-  object Global {
-    var oneWay = "nada"
-    var remoteReply = "nada"
+object Global {
+  var oneWay = "nada"
+  var remoteReply = "nada"
+}
+class RemoteActorSpecActorUnidirectional extends Actor {
+  dispatcher = Dispatchers.newThreadBasedDispatcher(this)
+
+  def receive = {
+    case "OneWay" =>
+      Global.oneWay = "received"
   }
-  case class Send(actor: Actor)
+}
 
-  class RemoteActorSpecActorUnidirectional extends Actor {
-    dispatcher = Dispatchers.newThreadBasedDispatcher(this)
+class RemoteActorSpecActorBidirectional extends Actor {
+  def receive = {
+    case "Hello" =>
+      reply("World")
+    case "Failure" =>
+      throw new RuntimeException("expected")
+  }
+}
 
-    def receive = {
-      case "OneWay" =>
-        Global.oneWay = "received"
-    }
+case class Send(actor: Actor)
+
+class RemoteActorSpecActorAsyncSender extends Actor {
+  def receive = {
+    case Send(actor: Actor) =>
+      actor ! "Hello"
+    case "World" =>
+      Global.remoteReply = "replied"
   }
 
-  class RemoteActorSpecActorBidirectional extends Actor {
-    def receive = {
-      case "Hello" =>
-        reply("World")
-      case "Failure" =>
-        throw new RuntimeException("expected")
-    }
-  }
-
-  class RemoteActorSpecActorAsyncSender extends Actor {
-    def receive = {
-      case Send(actor: Actor) =>
-        actor ! "Hello"
-      case "World" =>
-        Global.remoteReply = "replied"
-    }
-
-    def send(actor: Actor) {
-      this ! Send(actor)
-    }
+  def send(actor: Actor) {
+    this ! Send(actor)
   }
 }
 
 class ClientInitiatedRemoteActorTest extends JUnitSuite {
-  import ClientInitiatedRemoteActorTest._
+  import Actor.Sender.Self
+
   akka.Config.config
 
   val HOSTNAME = "localhost"
@@ -58,8 +57,6 @@ class ClientInitiatedRemoteActorTest extends JUnitSuite {
   var s1: RemoteServer = null
   var s2: RemoteServer = null
 
-  import Actor.Sender.Self
-
   @Before
   def init() {
     s1 = new RemoteServer()
@@ -119,7 +116,6 @@ class ClientInitiatedRemoteActorTest extends JUnitSuite {
     actor.stop
   }
 
- 
   @Test
   def shouldSendReceiveException = {
     implicit val timeout = 500000000L
diff --git a/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala b/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
index 2f1ef161c8..1867d09c5f 100644
--- a/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
+++ b/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
@@ -8,6 +8,38 @@ import org.junit.{Test, Before, After}
 import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
 import se.scalablesolutions.akka.dispatch.Dispatchers
 
+object ServerInitiatedRemoteActorServer {
+
+  class TestActor extends Actor {
+    start
+    def receive = {
+      case "Hello" =>
+        reply("World")
+    }
+  }
+
+  def main(args: Array[String]) = {
+    import ServerInitiatedRemoteActorTest._
+
+    server = new RemoteServer()
+    server.start(HOSTNAME, PORT)
+
+    server.register(new TestActor)
+  }
+}
+
+object ServerInitiatedRemoteActorClient {
+  def main(args: Array[String]) = {
+    import ServerInitiatedRemoteActorTest._
+    val actor = RemoteClient.actorFor(
+      "se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorServer$TestActor",
+      5000L,
+      HOSTNAME, PORT)
+    val result = actor !! "Hello"
+    println("======== RESULT: " + result)
+  }
+}
+
 object ServerInitiatedRemoteActorTest {
   val HOSTNAME = "localhost"
   val PORT = 9990