diff --git a/test/check-storage-cockpit b/test/check-storage-cockpit
index 9b2c72522..847c8e65a 100755
--- a/test/check-storage-cockpit
+++ b/test/check-storage-cockpit
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; If not, see <http://www.gnu.org/licenses/>.
 
-from anacondalib import VirtInstallMachineCase, pixel_tests_ignore
+from anacondalib import VirtInstallMachineCase, pixel_tests_ignore, run_boot
 from installer import Installer
 from review import Review
 from storage import Storage
@@ -173,6 +173,7 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         checkStorageReview()
 
     @nondestructive
+    @run_boot("bios", "efi")
     def testBtrfsSubvolumes(self):
         b = self.browser
         m = self.machine
@@ -198,12 +199,17 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         self.click_dropdown(self.card_row("Storage", 1), "Create partition table")
         self.confirm()
 
+        # Create EFI partition
         self.click_dropdown(self.card_row("Storage", 2), "Create partition")
-        self.dialog({"size": 1, "type": "biosboot"})
+        if self.is_efi:
+            self.dialog({"size": 100, "type": "efi", "mount_point": "/boot/efi"})
+        else:
+            self.dialog({"size": 100, "type": "biosboot"})
 
         self.click_dropdown(self.card_row("Storage", 3), "Create partition")
         self.dialog({"size": 1070, "type": "ext4", "mount_point": "/boot"})
 
+
         self.click_dropdown(self.card_row("Storage", 4), "Create partition")
         self.dialog({"type": "btrfs"})
 
@@ -235,12 +241,16 @@ class TestStorageCockpitIntegration(VirtInstallMachineCase, StorageCase):
         dev = "vda"
         r.check_disk(dev, "16.1 GB vda (Virtio Block Device)")
 
+        if self.is_efi:
+            r.check_disk_row(dev, "/boot/efi", "vda1", "99.6 MB", False)
         r.check_disk_row(dev, "/boot", "vda2", "1.07 GB", False)
-        r.check_disk_row(dev, "/", "vda3", "15.0 GB", False, None, False, 3)
-        r.check_disk_row(dev, "/home", "vda3", "15.0 GB", False)
+        r.check_disk_row(dev, "/", "vda3", "14.9 GB", False, None, False, 4 if self.is_efi else 3)
+        r.check_disk_row(dev, "/home", "vda3", "14.9 GB", False)
 
         # Check fstab
         fstab = m.execute("cat /etc/fstab")
+        if self.is_efi:
+            self.assertTrue("/mnt/sysroot/boot/efi auto noauto 0 0" in fstab)
         self.assertTrue("/mnt/sysroot/boot auto noauto 0 0" in fstab)
         self.assertTrue("/mnt/sysroot/btrfs-mount-test auto subvol=/ 0 0" in fstab)
         self.assertTrue("/mnt/sysroot btrfs noauto,subvol=root 0 0" in fstab)