Fix the tests broken by eec5d3c8