Fixes randomly randomly failing tests.
Merge pull request #868 from jails/bug/random-failing-tests

Fixes randomly randomly failing tests.