Improve adjustment of suite for $FAI_DEBOOTSTRAP