Apply temporary fix to broken test, refs T854