testsuite: Improve reliability

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Merge pull request #65 from stgraber/master

testsuite: Improve reliability