diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
index 0955d47271..d708c033eb 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
@@ -83,6 +83,9 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout {
       a1 ! PoisonPill
       expectTerminated(a1)
 
+      // let it be completely removed from user guardian
+      expectNoMsg(1 second)
+
       // not equal because it's terminated
       system.actorFor(a1.path.toString) must not be (a1)
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala
index fd0d6fee96..418924842d 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala
@@ -14,6 +14,9 @@ import akka.cluster.ClusterEvent.MemberRemoved
 import akka.remote.FailureDetectorRegistry
 import akka.remote.RemoteWatcher
 
+/**
+ * INTERNAL API
+ */
 private[cluster] object ClusterRemoteWatcher {
   /**
    * Factory method for `ClusterRemoteWatcher` [[akka.actor.Props]].