Bug 5347 Follow up, fix for broken test