Bug 874674 - fix test bustage, rs=mconley over IRC. Will file followup to consider more in-depth