Bug 915156 - fix the test runs