NXP-11367: Fix test failure depending on test order