Fix the testsuite after 059b7429eb