Bug 12748: (QA followup) make new tests pass