Bug 827187 - Part 2: Fix test bustage; r=rnewman