diff --git a/akka-actor/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor/src/test/java/akka/dispatch/JavaFutureTests.java
new file mode 100644
index 0000000000..b4d01ce575
--- /dev/null
+++ b/akka-actor/src/test/java/akka/dispatch/JavaFutureTests.java
@@ -0,0 +1,29 @@
+package akka.dispatch;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import java.util.concurrent.Callable;
+import scala.runtime.AbstractFunction1;
+import scala.Some;
+import scala.Right;
+import static akka.dispatch.Futures.future;
+
+@SuppressWarnings("unchecked") public class JavaFutureTests {
+
+    @Test public void mustBeAbleToMapAFuture() {
+        Future f1 = future(new Callable<String>() {
+                public String call() {
+                    return "Hello";
+                }
+            });
+
+        Future f2 = f1.map(new AbstractFunction1<String, String>() {
+                public String apply(String s) {
+                    return s + " World";
+                }
+            });
+
+        assertEquals(new Some(new Right("Hello World")), f2.await().value());
+    }
+
+}
diff --git a/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
index f6347b56d2..b085e70248 100644
--- a/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -1,10 +1,10 @@
-package akka.actor
+package akka.dispatch
 
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
+import akka.actor.{ Actor, ActorRef }
 import Actor._
 import org.multiverse.api.latches.StandardLatch
-import akka.dispatch. {Future, Futures}
 import java.util.concurrent. {TimeUnit, CountDownLatch}
 
 object FutureSpec {
@@ -31,6 +31,8 @@ object FutureSpec {
   }
 }
 
+class JavaFutureSpec extends JavaFutureTests with JUnitSuite
+
 class FutureSpec extends JUnitSuite {
   import FutureSpec._