[OS-BUILD PATCH 0/5] redhat: Fix self-tests