Try workaround for test issues in #21425
1 file changed