diff --git a/tests/support/cluster_util.tcl b/tests/support/cluster_util.tcl
index c19aea3c15..dd5cd84df2 100644
--- a/tests/support/cluster_util.tcl
+++ b/tests/support/cluster_util.tcl
@@ -227,6 +227,15 @@ proc cluster_setup {masters replicas node_count slot_allocator replica_allocator
     # Setup master/replica relationships
     $replica_allocator $masters $replicas
 
+    # A helper debug log that can print the server id in the server logs.
+    # This can help us locate the corresponding server in the log file.
+    for {set i 0} {$i < $masters} {incr i} {
+        R $i DEBUG LOG "========== I am primary $i =========="
+    }
+    for {set i $i} {$i < [expr $masters+$replicas]} {incr i} {
+        R $i DEBUG LOG "========== I am replica $i =========="
+    }
+
     wait_for_cluster_propagation
     wait_for_cluster_state "ok"
 
diff --git a/tests/unit/cluster/replica-migration.tcl b/tests/unit/cluster/replica-migration.tcl
index 49c31128ba..8053859c69 100644
--- a/tests/unit/cluster/replica-migration.tcl
+++ b/tests/unit/cluster/replica-migration.tcl
@@ -75,9 +75,15 @@ proc test_migrated_replica {type} {
             fail "Failover does not happened"
         }
 
-        # Make sure the offset of server 3 / 7 is 0.
-        verify_log_message -3 "*Start of election*offset 0*" 0
-        verify_log_message -7 "*Start of election*offset 0*" 0
+        # The node may not be able to initiate an election in time due to
+        # problems with cluster communication. If an election is initiated,
+        # we make sure the offset of server 3 / 7 is 0.
+        if {[count_log_message -3 "Start of election"] != 0} {
+            verify_log_message -3 "*Start of election*offset 0*" 0
+        }
+        if {[count_log_message -7 "Start of election"] != 0} {
+            verify_log_message -7 "*Start of election*offset 0*" 0
+        }
 
         # Make sure the right replica gets the higher rank.
         verify_log_message -4 "*Start of election*rank #0*" 0
@@ -170,9 +176,14 @@ proc test_nonempty_replica {type} {
             fail "Failover does not happened"
         }
 
-        # Make sure server 7 gets the lower rank and it's offset is 0.
         verify_log_message -4 "*Start of election*rank #0*" 0
-        verify_log_message -7 "*Start of election*offset 0*" 0
+
+        # The node may not be able to initiate an election in time due to
+        # problems with cluster communication. If an election is initiated,
+        # we make sure server 7 gets the lower rank and it's offset is 0.
+        if {[count_log_message -7 "Start of election"] != 0} {
+            verify_log_message -7 "*Start of election*offset 0*" 0
+        }
 
         # Wait for the cluster to be ok.
         wait_for_condition 1000 50 {
@@ -283,9 +294,15 @@ proc test_sub_replica {type} {
             fail "Failover does not happened"
         }
 
-        # Make sure the offset of server 3 / 7 is 0.
-        verify_log_message -3 "*Start of election*offset 0*" 0
-        verify_log_message -7 "*Start of election*offset 0*" 0
+        # The node may not be able to initiate an election in time due to
+        # problems with cluster communication. If an election is initiated,
+        # we make sure the offset of server 3 / 7 is 0.
+        if {[count_log_message -3 "Start of election"] != 0} {
+            verify_log_message -3 "*Start of election*offset 0*" 0
+        }
+        if {[count_log_message -7 "Start of election"] != 0} {
+            verify_log_message -7 "*Start of election*offset 0*" 0
+        }
 
         # Wait for the cluster to be ok.
         wait_for_condition 1000 50 {