Have you tested this in multiple environments (Ubuntu 32-bit, Ubuntu 64-bit, and Mac OS X)?  I'm nervous about introducing flakey tests, so let's make sure this works reliably.  If you haven't already, please run the test suite multiple times (at least 10) in each environment.