Upgrade tests for 0.8.7
Merge branch 'bug2439' of git://github.com/orvant/buildbot