Resolve #3252586 "Fix the tests"