Bug 951887 followup.  Adjust tests to deal with the new reality.