diff --git a/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java b/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java
index 2de4df547d..c0e267b653 100644
--- a/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/GraphStageLoggingDocTest.java
@@ -9,7 +9,13 @@ import akka.stream.Attributes;
 import akka.stream.Materializer;
 import akka.stream.Outlet;
 import akka.stream.SourceShape;
-import akka.stream.stage.*;
+//#stage-with-logging
+import akka.stream.stage.AbstractOutHandler;
+import akka.stream.stage.GraphStage;
+import akka.stream.stage.GraphStageLogic;
+import akka.stream.stage.GraphStageLogicWithLogging;
+
+//#stage-with-logging
 import jdocs.AbstractJavaTest;
 import org.junit.Test;
 
@@ -21,7 +27,7 @@ public class GraphStageLoggingDocTest extends AbstractJavaTest {
 
   @Test
   public void compileOnlyTestClass() throws Exception { }
-  
+
   //#stage-with-logging
   public class RandomLettersSource extends GraphStage<SourceShape<String>> {
     public final Outlet<String> out = Outlet.create("RandomLettersSource.in");
diff --git a/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala b/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala
index cce8b53f43..2c2dd5f2c8 100644
--- a/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala
+++ b/akka-docs/src/test/scala/docs/stream/GraphStageLoggingDocSpec.scala
@@ -7,7 +7,6 @@ import java.util.concurrent.ThreadLocalRandom
 
 import akka.stream._
 import akka.stream.scaladsl._
-import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler, StageLogging }
 import akka.testkit.{ AkkaSpec, EventFilter }
 
 class GraphStageLoggingDocSpec extends AkkaSpec("akka.loglevel = DEBUG") {
@@ -16,6 +15,8 @@ class GraphStageLoggingDocSpec extends AkkaSpec("akka.loglevel = DEBUG") {
   implicit val ec = system.dispatcher
 
   //#stage-with-logging
+  import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler, StageLogging }
+
   final class RandomLettersSource extends GraphStage[SourceShape[String]] {
     val out = Outlet[String]("RandomLettersSource.out")
     override val shape: SourceShape[String] = SourceShape(out)