fix tests for jenkins/ubuntu (round 2)