diff --git a/tests/unattended_install.py b/tests/unattended_install.py
index 893fa5664827d4cc0dd46febb3e007898a217a3e..c3c2575a00918eb4465abd56888b847cd8db9e94 100644
--- a/tests/unattended_install.py
+++ b/tests/unattended_install.py
@@ -690,7 +690,8 @@ class UnattendedInstallConfig(object):
             if "autoyast" in self.kernel_params:
                 # SUSE autoyast install
                 dest_fname = "autoinst.xml"
-                if self.cdrom_unattended:
+                if (self.cdrom_unattended and
+                    self.params.get('unattended_delivery_method') == 'cdrom'):
                     boot_disk = utils_disk.CdromDisk(self.cdrom_unattended,
                                                      self.tmpdir)
                 elif self.floppy: