fixed test that randomly fails
Merge branch '2.5'

* 2.5:
  fixed test that randomly fails