diff --git a/akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala b/akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala
new file mode 100644
index 0000000000..79c95689e2
--- /dev/null
+++ b/akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala
@@ -0,0 +1,37 @@
+package sample
+
+import se.scalablesolutions.akka.actor.Actor
+import se.scalablesolutions.akka.remote.{RemoteClient, RemoteServer}
+import se.scalablesolutions.akka.util.Logging
+
+class HelloWorldActor extends Actor {
+  start
+  def receive = {
+    case "Hello" => reply("World")
+  }
+}
+
+object ServerInitiatedRemoteActorServer {
+
+  def run = {
+    val server = new RemoteServer()
+    server.start("localhost", 9999)
+    server.register(new HelloWorldActor)
+  }
+
+  def main(args: Array[String]) = run
+}
+
+object ServerInitiatedRemoteActorClient extends Logging {
+  
+  def run = {
+    val actor = RemoteClient.actorFor(
+      "sample.HelloWorldActor",
+      5000L, "localhost", 9999)
+    val result = actor !! "Hello"
+    log.info("Result from Remote Actor: %s", result)
+  }
+
+  def main(args: Array[String]) = run
+}
+
diff --git a/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala b/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
index 1867d09c5f..2f1ef161c8 100644
--- a/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
+++ b/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
@@ -8,38 +8,6 @@ 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