add a test
more versatile 'expected error' handling
until bug25663 gets fixed
merge bug25631 into stable
actually run the new test
merge bug25631 into stable