Fix OOIION-1316; intermittent test failure

@jamie-cyber1 please review