Bug 941907: Fix usage of old test style.