Fix OOIION-1316; intermittent test failure