FBTest fix for spy/2285 (since bug 843508)
FBTest: yet fix for 2285 (and keep compat with Fx21)