diff --git a/tests/a11y/pickers.txt b/tests/a11y/pickers.txt
index 4eb99e1a72..387b18f02e 100644
--- a/tests/a11y/pickers.txt
+++ b/tests/a11y/pickers.txt
@@ -15,135 +15,10 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    button4
-      "filler"
-      parent: grid1
-      index: 0
-      state: enabled horizontal sensitive showing visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: widget
-      alpha: 1
-      unnamed-GtkButtonAccessible-0
-        "push button"
-        parent: button4
-        index: 0
-        name: (None)
-        state: enabled focusable sensitive showing visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkImage>
-        image size: -1 x -1
-        image description: (null)
-        <AtkAction>
-        action 0 name: click
-        action 0 description: Clicks the button
-      unnamed-GtkComboBoxAccessible-1
-        "combo box"
-        parent: button4
-        index: 1
-        state: enabled sensitive
-        toolkit: gtk
-        <AtkComponent>
-        layer: widget
-        alpha: 1
-        <AtkAction>
-        action 0 name: press
-        action 0 description: Presses the combobox
-        <AtkSelection>
-        unnamed-GtkMenuAccessible-2
-          "menu"
-          parent: unnamed-GtkComboBoxAccessible-1
-          index: 0
-          state: enabled sensitive
-          toolkit: gtk
-          <AtkComponent>
-          layer: popup
-          alpha: 1
-          <AtkSelection>
-          unnamed-GtkMenuItemAccessible-3
-            "menu item"
-            parent: unnamed-GtkMenuAccessible-2
-            index: 0
-            state: enabled selectable sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: popup
-            alpha: 1
-            <AtkAction>
-            action 0 name: click
-            action 0 description: Clicks the menuitem
-            <AtkSelection>
-          unnamed-GtkMenuItemAccessible-4
-            "menu item"
-            parent: unnamed-GtkMenuAccessible-2
-            index: 1
-            name: Desktop
-            state: enabled selectable sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: popup
-            alpha: 1
-            <AtkAction>
-            action 0 name: click
-            action 0 description: Clicks the menuitem
-            <AtkSelection>
-          unnamed-GtkMenuItemAccessible-5
-            "menu item"
-            parent: unnamed-GtkMenuAccessible-2
-            index: 2
-            name: File System
-            state: enabled selectable sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: popup
-            alpha: 1
-            <AtkAction>
-            action 0 name: click
-            action 0 description: Clicks the menuitem
-            <AtkSelection>
-          unnamed-GtkMenuItemAccessible-6
-            "separator"
-            parent: unnamed-GtkMenuAccessible-2
-            index: 3
-            state: enabled selectable sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: popup
-            alpha: 1
-            <AtkAction>
-            <AtkSelection>
-          unnamed-GtkMenuItemAccessible-7
-            "separator"
-            parent: unnamed-GtkMenuAccessible-2
-            index: 4
-            state: enabled selectable sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: popup
-            alpha: 1
-            <AtkAction>
-            <AtkSelection>
-          unnamed-GtkMenuItemAccessible-8
-            "menu item"
-            parent: unnamed-GtkMenuAccessible-2
-            index: 5
-            name: Other…
-            state: enabled selectable sensitive visible
-            toolkit: gtk
-            <AtkComponent>
-            layer: popup
-            alpha: 1
-            <AtkAction>
-            action 0 name: click
-            action 0 description: Clicks the menuitem
-            <AtkSelection>
     button3
       "push button"
       parent: grid1
-      index: 1
+      index: 0
       name: Sans
       state: enabled focusable sensitive showing visible
       toolkit: gtk
@@ -159,7 +34,7 @@ window1
     button2
       "push button"
       parent: grid1
-      index: 2
+      index: 1
       state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -174,7 +49,7 @@ window1
     button1
       "combo box"
       parent: grid1
-      index: 3
+      index: 2
       state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -184,7 +59,7 @@ window1
       action 0 name: press
       action 0 description: Presses the combobox
       <AtkSelection>
-      unnamed-GtkMenuAccessible-9
+      unnamed-GtkMenuAccessible-0
         "menu"
         parent: button1
         index: 0
diff --git a/tests/a11y/pickers.ui b/tests/a11y/pickers.ui
index 91b2cd19ad..a540fa1ccb 100644
--- a/tests/a11y/pickers.ui
+++ b/tests/a11y/pickers.ui
@@ -34,6 +34,7 @@
             <property name="top_attach">0</property>
           </packing>
         </child>
+<!--
         <child>
           <object class="GtkFileChooserButton" id="button4">
             <property name="visible">True</property>
@@ -43,6 +44,7 @@
             <property name="top_attach">0</property>
           </packing>
         </child>
+-->
       </object>
     </child>
   </object>