Another attempt to fix failover test flapping