Minor improvement for JENKINS-25819 unit tests fixed