r23231: Fix make test on build farm for 64-bit hosts. There's no reason this should