LUCENE-6005: fix test failures

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene6005@1635000 13f79535-47bb-0310-9956-ffa450edef68