Unbreak tests after b83d48af65