Bug 971559 - Fix test fallout from bug 960901 being backed out.