NXP-13829: trying to fix tests on hudson-xp