Bug 941907: Fix usage of old test style.
Merge pull request #1303 from Mossop/bug941907

Fix Bug 941907: Fix usage of old test style., r=@jsantell