Fix test suite failure intoduced in #511

See #534