diff --git a/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java b/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java
index 17151595a0..ca1c252696 100644
--- a/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java
+++ b/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java
@@ -1,5 +1,25 @@
 package docs.pattern;
 
+import java.util.concurrent.TimeoutException;
+
+import akka.actor.ActorKilledException;
+import akka.actor.ActorRef;
+import akka.actor.ActorRefFactory;
+import akka.actor.Cancellable;
+import akka.actor.OneForOneStrategy;
+import akka.actor.Props;
+import akka.actor.Scheduler;
+import akka.actor.Status;
+import akka.actor.SupervisorStrategy;
+import akka.actor.SupervisorStrategy.Directive;
+import akka.actor.Terminated;
+import akka.actor.UntypedActor;
+import akka.dispatch.Future;
+import akka.japi.Function;
+import akka.pattern.Patterns;
+import akka.util.Duration;
+import akka.util.Timeout;
+
 public class SupervisedAsk {
 
   private static class AskParam {
diff --git a/akka-docs/rst/java/code/docs/pattern/SupervisedAskSpec.java b/akka-docs/rst/java/code/docs/pattern/SupervisedAskSpec.java
index f1d1af32f6..c769ee0089 100644
--- a/akka-docs/rst/java/code/docs/pattern/SupervisedAskSpec.java
+++ b/akka-docs/rst/java/code/docs/pattern/SupervisedAskSpec.java
@@ -1,23 +1,28 @@
 package docs.pattern;
 
-import docs.testkit.TestKitSampleTest.SomeActor;
-import scala.actors.Future;
-import actor.ActorRef;
-import actor.Props;
+import akka.actor.ActorRef;
+import akka.actor.ActorRefFactory;
+import akka.actor.Props;
+import akka.actor.UntypedActor;
+import akka.dispatch.Await;
+import akka.dispatch.Future;
+import akka.util.Timeout;
 
 public class SupervisedAskSpec {
 
-  public void execute() {
+  public Object execute(Class<? extends UntypedActor> someActor,
+      Object message, Timeout timeout, ActorRefFactory actorSystem)
+      throws Exception {
     // example usage
     try {
       ActorRef supervisorCreator = SupervisedAsk
           .createSupervisorCreator(actorSystem);
       Future<Object> finished = SupervisedAsk.askOf(supervisorCreator,
-          Props.apply(SomeActor.class), message, timeout);
-      Object result = Await.result(finished,
-          timeout.duration());
+          Props.apply(someActor), message, timeout);
+      return Await.result(finished, timeout.duration());
     } catch (Exception e) {
       // exception propagated by supervision
+      throw e;
     }
   }
 }