Backport from 3.0 of a better test for #1208
Merge pull request #2068 from yakky/feature/fix_1208_test_24

Backport from 3.0 of a better test for #1208