Bug 920072 - More fixes for runtest;r=me