diff --git a/akka-actor/src/test/java/se/scalablesolutions/akka/japi/JavaAPITestBase.java b/akka-actor/src/test/java/se/scalablesolutions/akka/japi/JavaAPITestBase.java
new file mode 100644
index 0000000000..af00530593
--- /dev/null
+++ b/akka-actor/src/test/java/se/scalablesolutions/akka/japi/JavaAPITestBase.java
@@ -0,0 +1,42 @@
+package se.scalablesolutions.akka.japi;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class JavaAPITestBase {
+
+    @Test public void shouldCreateSomeString() {
+        Option<String> o = Option.some("abc");
+        assertFalse(o.isEmpty());
+        assertTrue(o.isDefined());
+        assertEquals("abc", o.get());
+    }
+
+    @Test public void shouldCreateNone() {
+        Option<String> o1 = Option.none();
+        assertTrue(o1.isEmpty());
+        assertFalse(o1.isDefined());
+
+        Option<Float> o2 = Option.none();
+        assertTrue(o2.isEmpty());
+        assertFalse(o2.isDefined());
+    }
+
+    @Test public void shouldEnterForLoop() {
+        for(String s : Option.some("abc")) {
+            return;
+        }
+        fail("for-loop not entered");
+    }
+
+    @Test public void shouldNotEnterForLoop() {
+        for(Object o : Option.none()) {
+            fail("for-loop entered");
+        }
+    }
+
+    @Test public void shouldBeSingleton() {
+        assertSame(Option.none(), Option.none());
+    }
+}
diff --git a/akka-actor/src/test/scala/japi/JavaAPITest.scala b/akka-actor/src/test/scala/japi/JavaAPITest.scala
new file mode 100644
index 0000000000..721342b7af
--- /dev/null
+++ b/akka-actor/src/test/scala/japi/JavaAPITest.scala
@@ -0,0 +1,5 @@
+package se.scalablesolutions.akka.japi
+
+import org.scalatest.junit.JUnitSuite
+
+class JavaAPITest extends JavaAPITestBase with JUnitSuite
\ No newline at end of file