update test to avoid intermitent failure
Merge branch 'issue860' into 1.7.x