Update CI tests to match RHEL * This commit also pulls in changes from Lin Li <lilin@redhat.com> and Bruno Goncalves <bgoncalv@redhat.com>