[JENKINS-20662] Simplify test after feedback