Issue 4022: Hopefully fix the test