Testday: workarounds

Change-Id: I33ec22c0219cce9e8db6211d2050cc994e10c2e6