Fix for test failures associated with fix for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=410237