BS-2546 - fix tests execution with failsafe