diff --git a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java
index 3e0be1bdf8..1f478ee009 100644
--- a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java
+++ b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.java
@@ -528,23 +528,24 @@ public class UntypedActorDocTest {
     };
   }
 
+  static
   //#props-factory
-  public static class DemoActor extends UntypedActor {
+  public class DemoActor extends UntypedActor {
     
     /**
      * Create Props for an actor of this type.
-     * @param name The name to be passed to this actor’s constructor.
+     * @param magicNumber The magic number to be passed to this actor’s constructor.
      * @return a Props for creating this actor, which can then be further configured
      *         (e.g. calling `.withDispatcher()` on it)
      */
-    public static Props mkProps(String name) {
-      return Props.create(DemoActor.class, name);
+    public static Props props(int magicNumber) {
+      return Props.create(DemoActor.class, magicNumber);
     }
     
-    final String name;
+    final int magicNumber;
 
-    public DemoActor(String name) {
-      this.name = name;
+    public DemoActor(int magicNumber) {
+      this.magicNumber = magicNumber;
     }
     
     @Override
@@ -555,10 +556,10 @@ public class UntypedActorDocTest {
   }
   
   //#props-factory
-  {
-    if (system != null)
-      //#props-factory
-      system.actorOf(DemoActor.mkProps("hello"));
+  @Test
+  public void demoActor() {
+    //#props-factory
+    system.actorOf(DemoActor.props(42), "demo");
     //#props-factory
   }
 
diff --git a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
index 89e57826ce..b0573d6995 100644
--- a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
@@ -55,22 +55,22 @@ class DemoActorWrapper extends Actor {
   object DemoActor {
     /**
      * Create Props for an actor of this type.
-     * @param name The name to be passed to this actor’s constructor.
+     * @param magciNumber The magic number to be passed to this actor’s constructor.
      * @return a Props for creating this actor, which can then be further configured
      *         (e.g. calling `.withDispatcher()` on it)
      */
-    def props(name: String): Props = Props(classOf[DemoActor], name)
+    def props(magicNumber: Int): Props = Props(classOf[DemoActor], magicNumber)
   }
 
-  class DemoActor(name: String) extends Actor {
+  class DemoActor(magicNumber: Int) extends Actor {
     def receive = {
-      case x ⇒ // some behavior
+      case x: Int ⇒ sender ! (x + magicNumber)
     }
   }
 
   // ...
 
-  context.actorOf(DemoActor.props("hello"))
+  context.actorOf(DemoActor.props(42), "demo")
   //#props-factory
 
   def receive = Actor.emptyBehavior