[#7527] test fix from Alexander Luberg to pass with latest master changes