NXP-10782 - Improve workaround for surefire