Fix tests for issue #11159.