Bug 856361. Fix test bustage. r=me

--HG--
extra : rebase_source : fe7a3854f521518f80c3ae8d70bae13eadfca3b7