Merge pull request #1846 from clebertsuconic/2.4.x

fixing broken test