Fix eunit test hang/brokenness since at least 1.4.6