Possible fix for build server test failure