Follow up to fix failing unit test - TRUNK-3822