In #2134 and dfd0f4c5a458b88857be4a035d910ffc5934f6eb some testing changes got committed by accident which caused this regression. This patch reverts it to how it was before.