Re #7143 Fix system test