Make CI more green issue #2048