Reenable test and possibly make it less flaky.
Merge pull request #2923 from davidegrohmann/1.9-reenable-test

Reenable test and possibly make it less flaky