[JENKINS-19466] test fixes