[#8336] Make tests pass on OSX
2 files changed