A fix for the broken test
Merge remote-tracking branch 'matthias-ronge/fix-broken-test' into feature-zm