3.8: more tester patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>