diff --git a/tests/sanity/runtest.sh b/tests/sanity/runtest.sh
index 8e60700..ededecd 100755
--- a/tests/sanity/runtest.sh
+++ b/tests/sanity/runtest.sh
@@ -97,6 +97,11 @@ rlJournalStart
 
         # check kernel installation, must not create /boot/<machineid>
         if [ $UID -eq 0 ]; then
+            rlLog "Apply machine-id workaround if running from a cloud image"
+            pushd /boot/loader/entries/
+                [ -f ffffffffffffffffffffffffffffffff-$(uname -r).conf ] && \
+                    mv ffffffffffffffffffffffffffffffff-$(uname -r).conf $(cat /etc/machine-id)-$(uname -r).conf
+            popd
             if rlCheckRpm kernel-core; then
                 rlRun "dnf -y reinstall kernel-core" 0 "Reinstalling the kernel to verify BLS scripts function"
                 rlAssertNotExists /boot/`cat /etc/machine-id`