Bug 1073553: Make hg tests more reliable; fix tox.ini r=mgerva