Fix test failures caused by [8d09aa233031]