Minor improvement for JENKINS-25819