Tweak for 4.0.x, test skip due to log changes