Align with test execution change.