Bug 1039925 - Fix tests as a follow-up to Bug 822820. r=trivial