Merge pull request #1300 from clebertsuconic/2.3.x

avoiding /tmp on test as it can fail depending on the server's state