diff --git a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.java b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.java
index d6b0ac7c20..fc136366ee 100644
--- a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.java
+++ b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.java
@@ -4,6 +4,7 @@
 package docs.remoting;
 
 import akka.testkit.AkkaJUnitActorSystemResource;
+import docs.AbstractJavaTest;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -21,7 +22,7 @@ import akka.remote.RemoteScope;
 
 import akka.actor.AbstractActor;
 
-public class RemoteDeploymentDocTest {
+public class RemoteDeploymentDocTest extends AbstractJavaTest {
 
   public static class SampleActor extends AbstractActor {
     @Override
diff --git a/akka-docs/rst/java/code/docs/stream/QuickStartDocTest.java b/akka-docs/rst/java/code/docs/stream/QuickStartDocTest.java
index 6e41c5557e..e58a55318c 100644
--- a/akka-docs/rst/java/code/docs/stream/QuickStartDocTest.java
+++ b/akka-docs/rst/java/code/docs/stream/QuickStartDocTest.java
@@ -20,6 +20,7 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import docs.AbstractJavaTest;
 import scala.concurrent.duration.Duration;
 //#other-imports
 
@@ -29,7 +30,7 @@ import org.junit.*;
  * This class is not meant to be run as a test in the test suite, but it
  * is set up such that it can be run interactively from within an IDE.
  */
-public class QuickStartDocTest {
+public class QuickStartDocTest extends AbstractJavaTest {
   
   static
   //#create-materializer
diff --git a/akka-docs/rst/java/code/docs/testkit/ParentChildTest.java b/akka-docs/rst/java/code/docs/testkit/ParentChildTest.java
index 7c775f4be1..d48034863d 100644
--- a/akka-docs/rst/java/code/docs/testkit/ParentChildTest.java
+++ b/akka-docs/rst/java/code/docs/testkit/ParentChildTest.java
@@ -14,10 +14,11 @@ import akka.testkit.TestProbe;
 
 import com.typesafe.config.ConfigFactory;
 
+import docs.AbstractJavaTest;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-public class ParentChildTest {
+public class ParentChildTest extends AbstractJavaTest {
   @ClassRule
   public static AkkaJUnitActorSystemResource actorSystemResource =
     new AkkaJUnitActorSystemResource("TestKitDocTest",
diff --git a/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java b/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
index 472cf33068..3e9107daf6 100644
--- a/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
+++ b/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
@@ -6,6 +6,8 @@ package docs.testkit;
 import static org.junit.Assert.*;
 
 import akka.testkit.*;
+import docs.AbstractJavaTest;
+import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -24,7 +26,7 @@ import scala.concurrent.Future;
 import akka.testkit.TestActor.AutoPilot;
 import scala.concurrent.duration.Duration;
 
-public class TestKitDocTest {
+public class TestKitDocTest extends AbstractJavaTest {
 
   @ClassRule
   public static AkkaJUnitActorSystemResource actorSystemResource =
@@ -76,7 +78,7 @@ public class TestKitDocTest {
     final TestActorRef<MyActor> ref = TestActorRef.create(system, props, "myActor");
     try {
       ref.receive(new Exception("expected"));
-      fail("expected an exception to be thrown");
+      Assert.fail("expected an exception to be thrown");
     } catch (Exception e) {
       assertEquals("expected", e.getMessage());
     }
diff --git a/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java b/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
index a99ec38c6a..d2706e1b26 100644
--- a/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
+++ b/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
@@ -4,6 +4,7 @@
 package docs.testkit;
 
 //#fullsample
+import docs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -16,7 +17,7 @@ import akka.actor.AbstractActor;
 import akka.testkit.JavaTestKit;
 import scala.concurrent.duration.Duration;
 
-public class TestKitSampleTest {
+public class TestKitSampleTest extends AbstractJavaTest {
   
   public static class SomeActor extends AbstractActor {
     ActorRef target = null;