Re #9958. Fix Linux and Mac tests.