Test fixup 3.5 4 debian

Hi, I was recently merging 3.5-4 for the extra tests that were added (thanks!). Running that on the autopkgtest backend of Ubuntu triggered some issues which I think would sooner or later also hit Debian. Therefore I rebased my fixes and provide them here for you as well.

The - now working - tests results are here. Please ignore i386 on that, which is only red due to Ubuntu fading out i386.