diff --git a/akka-docs/src/main/paradox/stream/operators/Source/range.md b/akka-docs/src/main/paradox/stream/operators/Source/range.md
index 65a0928d23..c6ff4ced5c 100644
--- a/akka-docs/src/main/paradox/stream/operators/Source/range.md
+++ b/akka-docs/src/main/paradox/stream/operators/Source/range.md
@@ -15,7 +15,7 @@ Emit each integer in a range, with an option to take bigger steps than 1.
 
 ## Description
 
-Emit each integer in a range, with an option to take bigger steps than 1. @scala[In Scala, you can use the `apply` method to generate a sequence of integers.]
+Emit each integer in a range, with an option to take bigger steps than 1. @scala[In Scala, use the `apply` method to generate a sequence of integers.]
 
 
 @@@div { .callout }
@@ -31,10 +31,9 @@ Emit each integer in a range, with an option to take bigger steps than 1. @scala
 Define the range of integers.
 
 Java
-:   @@snip [Source.java]($akka$/akka-docs/src/test/java/jdocs/stream/operators/Source.java) { #imports #range }
+:   @@snip [SourceDocExamples.java]($akka$/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java) { #range-imports #range }
 
 Print out the stream of integers.
 
 Java
-:   @@snip [Source.java]($akka$/akka-docs/src/test/java/jdocs/stream/operators/Source.java) { #run-range}
-
+:   @@snip [SourceDocExamples.java]($akka$/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java) { #run-range}
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/Source.java b/akka-docs/src/test/java/jdocs/stream/operators/Source.java
deleted file mode 100644
index f31e9f462e..0000000000
--- a/akka-docs/src/test/java/jdocs/stream/operators/Source.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
-  * Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
-  */
-package docs.stream.operators;
-
-//#imports
-import akka.NotUsed;
-import akka.stream.javadsl.Source;
-
-//#imports
-
-import akka.actor.ActorSystem;
-import akka.stream.ActorMaterializer;
-import akka.stream.Materializer;
-
-public class Source {
-
-  public static void main(String[] args) {
-    rangeExample();
-  }
-
-  static void rangeExample() {
-
-    final ActorSystem system = ActorSystem.create("Source");
-    final Materializer materializer = ActorMaterializer.create(system);
-
-    //#range
-    Source<Integer, NotUsed> source = Source.range(1, 100);
-
-    //#range
-
-    //#range
-    Source<Integer, NotUsed> sourceStepFive = Source.range(1, 100, 5);
-
-    //#range
-
-    //#range
-    Source<Integer, NotUsed> sourceStepNegative = Source.range(100, 1, -1);
-    //#range
-
-    //#run-range
-    source.runForeach(i -> System.out.println(i), materializer);
-    //#run-range
-  }
-}
\ No newline at end of file
diff --git a/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java b/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java
index e13bc9dfa3..e7f615cd23 100644
--- a/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java
+++ b/akka-docs/src/test/java/jdocs/stream/operators/SourceDocExamples.java
@@ -5,11 +5,13 @@
 package jdocs.stream.operators;
 
 //#imports
+//#range-imports
 import akka.NotUsed;
 import akka.actor.ActorSystem;
 import akka.stream.ActorMaterializer;
 import akka.stream.Materializer;
 import akka.stream.javadsl.Source;
+//#range-imports
 
 import java.util.Arrays;
 
@@ -32,4 +34,29 @@ public class SourceDocExamples {
         //#source-from-example
     }
 
+    static void rangeExample() {
+
+        final ActorSystem system = ActorSystem.create("Source");
+        final Materializer materializer = ActorMaterializer.create(system);
+
+        //#range
+
+        Source<Integer, NotUsed> source = Source.range(1, 100);
+
+        //#range
+
+        //#range
+        Source<Integer, NotUsed> sourceStepFive = Source.range(1, 100, 5);
+
+        //#range
+
+        //#range
+        Source<Integer, NotUsed> sourceStepNegative = Source.range(100, 1, -1);
+        //#range
+
+        //#run-range
+        source.runForeach(i -> System.out.println(i), materializer);
+        //#run-range
+    }
+
 }