In case of failures we don't want to leave an image with intermediate test configuration, as images are reused across multiple tests Follow-up for edca63a632
edca63a632