Fix test-packages

See #3012, though.