Issue #2230029: Updating from 2.7 to newer version was broken

This should fix the last tests!