More resilient test for #1208
Merge pull request #2046 from yakky/feature/test_1208

More resilient test for #1208