[JENKINS-14583] Fix tests