Based on a report from Fossies.org using Codespell. Followup to #15436
scratch5 would be left behind, and trying to run the test again on the same image would fail.
Also run mask_supporting_services() here.