Bug 1005552 - Followup to fix test failures. r=me a=me