diff --git a/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java b/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java
index fc40e3af67..ee8252a6ad 100644
--- a/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java
+++ b/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java
@@ -128,6 +128,8 @@ public class ZeromqDocTestBase {
     system.actorOf(new Props(HeapAlerter.class), "alerter");
     //#alerter2
 
+    // Let it run for a while to see some output.
+    // Don't do like this in real tests, this is only doc demonstration.
     Thread.sleep(3000L);
   }
 
@@ -190,7 +192,7 @@ public class ZeromqDocTestBase {
 
     @Override
     public void postRestart(Throwable reason) {
-      // don't call preStart
+      // don't call preStart, only schedule once
     }
 
     @Override
diff --git a/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala b/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala
index 796c95b27d..1b3970d70b 100644
--- a/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala
+++ b/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala
@@ -35,7 +35,13 @@ object ZeromqDocSpec {
     val os = ManagementFactory.getOperatingSystemMXBean
     val ser = SerializationExtension(context.system)
 
-    context.system.scheduler.schedule(1 second, 1 second, self, Tick)
+    override def preStart() {
+      context.system.scheduler.schedule(1 second, 1 second, self, Tick)
+    }
+
+    override def postRestart(reason: Throwable) {
+      // don't call preStart, only schedule once
+    }
 
     def receive: Receive = {
       case Tick ⇒
@@ -172,7 +178,9 @@ class ZeromqDocSpec extends AkkaSpec("akka.loglevel=INFO") {
     system.actorOf(Props[HeapAlerter], name = "alerter")
     //#alerter
 
-    Thread.sleep(3000)
+    // Let it run for a while to see some output.
+    // Don't do like this in real tests, this is only doc demonstration.
+    3.seconds.sleep()
 
   }