Improve testsuite robustness.