Add test for JENKINS-22610