Fix tests for issue #11159.
Fix tests for issue #11159.