MT#6021 Adapt tests for per-branch failure route.