Fix test failures caused by #8556