diff --git a/ui/webui/src/components/storage/MountPointMapping.jsx b/ui/webui/src/components/storage/MountPointMapping.jsx
index 3e55f1242d2..30acf5910d8 100644
--- a/ui/webui/src/components/storage/MountPointMapping.jsx
+++ b/ui/webui/src/components/storage/MountPointMapping.jsx
@@ -253,7 +253,7 @@ const FormatColumn = ({ deviceData, handleRequestChange, idPrefix, request, requ
     };
 
     return (
-        <Flex>
+        <Flex id={idPrefix}>
             {!isRootMountPoint &&
                 <FormatSwitch />}
             {isRootMountPoint &&
diff --git a/ui/webui/test/check-storage b/ui/webui/test/check-storage
index 74199b22c99..055f89baed0 100755
--- a/ui/webui/test/check-storage
+++ b/ui/webui/test/check-storage
@@ -514,7 +514,7 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase):
         self.check_row_device(1, "Select a device")
         self.check_row_device(2, "Select a device")
         self.select_row_device(1, f"{dev}2")
-        self.select_row_device(2, f"btrfs")
+        self.select_row_device(2, f"btrfstest")
 
         i.next()
         new_applied_partitioning = s.dbus_get_applied_partitioning()