Fix the test failure due to YARN-617