Thanks to Christian Heimes for noting the buildbot failures and
to Zachary Ware for providing the patch to make the new tests
play nice with both other platforms and unittest test discovery