NXP-14955: backport master tests  fix on 5.6