[9.18] Two minor fixes in the kasp system test

Backport of MR !8389 (merged)

Merge request reports