diff --git a/examples/autoinstall.yaml b/examples/autoinstall.yaml
index 70d19d18..93d7e199 100644
--- a/examples/autoinstall.yaml
+++ b/examples/autoinstall.yaml
@@ -51,5 +51,5 @@ storage:
   - {type: raid, name: md1, raidlevel: raid1, devices: [partition-system-1, partition-system-2], preserve: false, id: raid-system}
   - {type: format, fstype: ext4, volume: raid-boot, preserve: false, id: format-boot}
   - {type: format, fstype: ext4, volume: raid-system, preserve: false, id: format-system}
-  - {type: mount, device: format-boot, path: /boot, id: mount-boot}
   - {type: mount, device: format-system, path: /, id: mount-system}
+  - {type: mount, device: format-boot, path: /boot, id: mount-boot, options: 'errors=remount-ro'}
diff --git a/scripts/check-yaml-fields.py b/scripts/check-yaml-fields.py
index 9bd45a2a..821b53c2 100644
--- a/scripts/check-yaml-fields.py
+++ b/scripts/check-yaml-fields.py
@@ -17,7 +17,14 @@ def main():
             k, expected = arg, None
         v = config
         for part in k.split('.'):
+            if '[' in part:
+                part, index = part.split('[')
+                index = int(index[:-1])
+            else:
+                index = None
             v = v[part]
+            if index is not None:
+                v = v[index]
         if expected is None:
             print(v)
         else:
diff --git a/scripts/runtests.sh b/scripts/runtests.sh
index e3fd93ab..a83d6511 100755
--- a/scripts/runtests.sh
+++ b/scripts/runtests.sh
@@ -45,6 +45,8 @@ timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --autoi
 validate
 python3 scripts/check-yaml-fields.py .subiquity/subiquity-curtin-install.conf \
         debconf_selections.subiquity='"eek"'
+python3 scripts/check-yaml-fields.py .subiquity/subiquity-curtin-install.conf \
+        storage.config[-1].options='"errors=remount-ro"'
 python3 scripts/check-yaml-fields.py <(python3 scripts/check-yaml-fields.py .subiquity/etc/cloud/cloud.cfg.d/99-installer.cfg datasource.None.userdata_raw) \
         locale='"en_GB.UTF-8"'
 grep -q 'finish: subiquity/Install/install/postinstall/install_package1: SUCCESS: installing package1' \