Avoid test crash #1101839

Rebecca N. Palmerrequested to merge
test1101839 into master

Also some cleanups, which you are free to take or not.

(The red CI is a Lintian "error" due to salsa-ci-team/pipeline#490 (closed) .)

Merge request reports