Fix wrong test creating false positive - should be ported to master branch...
(cherry picked from commit fd68ddf)