milestone: Fix test failures caused by 57b8cc7.