diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
new file mode 100644
index 0000000000..03df632582
--- /dev/null
+++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java
@@ -0,0 +1,6 @@
+package se.scalablesolutions.akka.actor;
+
+public interface RemoteTypedActorOne {
+  public String requestReply(String s) throws Exception;
+  public void oneWay() throws Exception;
+}
\ No newline at end of file
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
new file mode 100644
index 0000000000..0744652181
--- /dev/null
+++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java
@@ -0,0 +1,29 @@
+package se.scalablesolutions.akka.actor.remote;
+
+import se.scalablesolutions.akka.actor.*;
+
+import java.util.concurrent.CountDownLatch;
+
+public class RemoteTypedActorOneImpl extends TypedActor implements RemoteTypedActorOne {
+
+    public static CountDownLatch latch = new CountDownLatch(1);
+
+    public String requestReply(String s) throws Exception {
+      if (s.equals("ping")) {
+        RemoteTypedActorLog.messageLog().put("ping");
+        return "pong";
+      } else if (s.equals("die")) {
+        throw new RuntimeException("Expected exception; to test fault-tolerance");
+      } else return null;
+    }
+
+    public void oneWay() throws Exception {
+      RemoteTypedActorLog.oneWayLog().put("oneway");
+    }
+
+    @Override
+    public void preRestart(Throwable e) {
+      try { RemoteTypedActorLog.messageLog().put(e.getMessage()); } catch(Exception ex) {}
+      latch.countDown();
+    }
+}
\ No newline at end of file
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
new file mode 100644
index 0000000000..58f294c6cd
--- /dev/null
+++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java
@@ -0,0 +1,6 @@
+package se.scalablesolutions.akka.actor;
+
+public interface RemoteTypedActorTwo {
+  public String requestReply(String s) throws Exception;
+  public void oneWay() throws Exception;
+}
\ No newline at end of file
diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
new file mode 100644
index 0000000000..36bb055ef8
--- /dev/null
+++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java
@@ -0,0 +1,29 @@
+package se.scalablesolutions.akka.actor.remote;
+
+import se.scalablesolutions.akka.actor.*;
+
+import java.util.concurrent.CountDownLatch;
+
+public class RemoteTypedActorTwoImpl extends TypedActor implements RemoteTypedActorTwo {
+
+    public static CountDownLatch latch = new CountDownLatch(1);
+
+    public String requestReply(String s) throws Exception {
+      if (s.equals("ping")) {
+        RemoteTypedActorLog.messageLog().put("ping");
+        return "pong";
+      } else if (s.equals("die")) {
+        throw new RuntimeException("Expected exception; to test fault-tolerance");
+      } else return null;
+    }
+
+    public void oneWay() throws Exception {
+      RemoteTypedActorLog.oneWayLog().put("oneway");
+    }
+
+    @Override
+    public void preRestart(Throwable e) {
+      try { RemoteTypedActorLog.messageLog().put(e.getMessage()); } catch(Exception ex) {}
+      latch.countDown();
+    }
+}
\ No newline at end of file
diff --git a/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala b/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala
new file mode 100644
index 0000000000..c49882f61d
--- /dev/null
+++ b/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala
@@ -0,0 +1,128 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ */
+
+package se.scalablesolutions.akka.actor.remote
+
+import org.scalatest.Spec
+import org.scalatest.Assertions
+import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.junit.JUnitRunner
+import org.junit.runner.RunWith
+
+import se.scalablesolutions.akka.config.Config
+import se.scalablesolutions.akka.config._
+import se.scalablesolutions.akka.config.TypedActorConfigurator
+import se.scalablesolutions.akka.config.JavaConfig._
+import se.scalablesolutions.akka.actor._
+import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
+
+import java.util.concurrent.{LinkedBlockingQueue, TimeUnit, BlockingQueue}
+
+object RemoteTypedActorSpec {
+  val HOSTNAME = "localhost"
+  val PORT = 9988
+  var server: RemoteServer = null
+}
+
+object RemoteTypedActorLog {
+  val messageLog: BlockingQueue[String] = new LinkedBlockingQueue[String]
+  val oneWayLog = new LinkedBlockingQueue[String]
+
+  def clearMessageLogs {
+    messageLog.clear
+    oneWayLog.clear
+  }
+}
+
+@RunWith(classOf[JUnitRunner])
+class RemoteTypedActorSpec extends
+  Spec with
+  ShouldMatchers with
+  BeforeAndAfterAll {
+
+  import RemoteTypedActorLog._
+  import RemoteTypedActorSpec._
+
+  private val conf = new TypedActorConfigurator
+
+  override def beforeAll = {
+    server = new RemoteServer()
+    server.start("localhost", 9995)
+    Config.config
+    conf.configure(
+      new RestartStrategy(new AllForOne, 3, 5000, List(classOf[Exception]).toArray),
+      List(
+        new Component(
+          classOf[RemoteTypedActorOne],
+          classOf[RemoteTypedActorOneImpl],
+          new LifeCycle(new Permanent),
+          10000,
+          new RemoteAddress("localhost", 9995)),
+        new Component(
+          classOf[RemoteTypedActorTwo],
+          classOf[RemoteTypedActorTwoImpl],
+          new LifeCycle(new Permanent),
+          10000,
+          new RemoteAddress("localhost", 9995)) 
+      ).toArray).supervise
+    Thread.sleep(1000)
+  }
+
+  override def afterAll = {
+    conf.stop
+    try {
+      server.shutdown
+      RemoteClient.shutdownAll
+      Thread.sleep(1000)
+    } catch {
+      case e => ()
+    }
+    ActorRegistry.shutdownAll
+  }
+
+  describe("Remote Typed Actor ") {
+
+    it("should receive one-way message") {
+      clearMessageLogs
+      val ta = conf.getInstance(classOf[RemoteTypedActorOne])
+
+      expect("oneway") {
+        ta.oneWay
+        oneWayLog.poll(5, TimeUnit.SECONDS)
+      }
+    }
+    
+    it("should respond to request-reply message") {
+      clearMessageLogs
+      val ta = conf.getInstance(classOf[RemoteTypedActorOne])
+
+      expect("pong") {
+        ta.requestReply("ping")
+      }
+    }
+
+    it("should be restarted on failure") {
+      clearMessageLogs
+      val ta = conf.getInstance(classOf[RemoteTypedActorOne])
+
+      intercept[RuntimeException] {
+        ta.requestReply("die")
+      }
+      messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance")
+    }
+
+    it("should restart linked friends on failure") {
+      clearMessageLogs
+      val ta1 = conf.getInstance(classOf[RemoteTypedActorOne])
+      val ta2 = conf.getInstance(classOf[RemoteTypedActorTwo])
+
+      intercept[RuntimeException] {
+        ta1.requestReply("die")
+      }
+      messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance")
+      messageLog.poll(5, TimeUnit.SECONDS) should equal ("Expected exception; to test fault-tolerance")
+    }
+  }
+}