diff --git a/t/230-orphan-not-stalling-init.t b/t/230-orphan-not-stalling-init.t
index d346ce19..c9eb5584 100755
--- a/t/230-orphan-not-stalling-init.t
+++ b/t/230-orphan-not-stalling-init.t
@@ -52,6 +52,7 @@ test:test('Check orphan mode not stalling queue', function(test)
     local attempts = 0
     -- Wait for replica to connect.
     while box.info.replication[3] == nil or
+        box.info.replication[3].downstream == nil or
         box.info.replication[3].downstream.status ~= 'follow' do
 
         attempts = attempts + 1
diff --git a/t/tnt/init.lua b/t/tnt/init.lua
index 94442523..f906409f 100644
--- a/t/tnt/init.lua
+++ b/t/tnt/init.lua
@@ -122,8 +122,11 @@ local function tnt_cluster_prepare(cfg_args)
 
     local attempts = 0
 
-    -- Wait for replica to connect.
-    while box.info.replication[2] == nil or box.info.replication[2].downstream.status ~= 'follow' do
+    -- Wait for replica to connect. It is listed once it is registered in
+    -- _cluster, but has no downstream until it subscribes.
+    while box.info.replication[2] == nil or
+          box.info.replication[2].downstream == nil or
+          box.info.replication[2].downstream.status ~= 'follow' do
         attempts = attempts + 1
         if attempts == 30 then
             error('wait for replica connection')