Bug 861844 - fix tests from bug 833763 r=borja