diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala b/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala
deleted file mode 100644
index cffed68a87..0000000000
--- a/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
- */
-package docs.agent
-
-import org.scalatest.junit.JUnitWrapperSuite
-
-class AgentDocJavaSpec extends JUnitWrapperSuite(
-  "docs.agent.AgentDocTest",
-  Thread.currentThread.getContextClassLoader)
diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
index efcdcd58bb..524d2fab4b 100644
--- a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
+++ b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
@@ -5,6 +5,7 @@ package docs.agent;
 
 import static org.junit.Assert.*;
 
+import docs.AbstractJavaTest;
 import org.junit.Test;
 
 import scala.concurrent.Await;
@@ -24,7 +25,7 @@ import scala.concurrent.duration.Duration;
     import scala.concurrent.Future;
 //#import-future
 
-public class AgentDocTest {
+public class AgentDocTest extends docs.AbstractJavaTest {
 
   private static ExecutionContext ec = ExecutionContexts.global();