OS-2260 fix regression caused by OS-2059 which broke 'make check' on a clean checkout on OS X.