Bug 861844 - fix tests from bug 833763 r=borja
Merge pull request #9177 from julienw/861844-fix-tests

Bug 861844 - fix tests from bug 833763 r=borja