Fix tests for #11798
2 files changed