diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 7797c6e7af..315fd91bd2 100644
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubar1
     "menu bar"
     parent: window1
diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index 1677ec701e..27a20fdabc 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubutton
     "toggle button"
     parent: window1
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index ed5eebdd06..5152943581 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubutton
     "toggle button"
     parent: window1
@@ -30,7 +22,7 @@ window1
     <AtkAction>
     action 0 name: click
     action 0 description: Clicks the button
-  unnamed-GtkPopoverAccessible-1
+  unnamed-GtkPopoverAccessible-0
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -39,54 +31,54 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkContainerAccessible-2
+    unnamed-GtkContainerAccessible-1
       "panel"
-      parent: unnamed-GtkPopoverAccessible-1
+      parent: unnamed-GtkPopoverAccessible-0
       index: 0
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-2
         "filler"
-        parent: unnamed-GtkContainerAccessible-2
+        parent: unnamed-GtkContainerAccessible-1
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-3
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-2
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-4
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-3
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-5
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-4
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-6
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-5
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index ed5eebdd06..5152943581 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubutton
     "toggle button"
     parent: window1
@@ -30,7 +22,7 @@ window1
     <AtkAction>
     action 0 name: click
     action 0 description: Clicks the button
-  unnamed-GtkPopoverAccessible-1
+  unnamed-GtkPopoverAccessible-0
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -39,54 +31,54 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkContainerAccessible-2
+    unnamed-GtkContainerAccessible-1
       "panel"
-      parent: unnamed-GtkPopoverAccessible-1
+      parent: unnamed-GtkPopoverAccessible-0
       index: 0
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-2
         "filler"
-        parent: unnamed-GtkContainerAccessible-2
+        parent: unnamed-GtkContainerAccessible-1
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-3
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-2
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-4
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-3
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-5
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-4
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-6
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-5
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt
index 89eeed7a77..c901c29886 100644
--- a/testsuite/a11y/menus.txt
+++ b/testsuite/a11y/menus.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubar1
     "menu bar"
     parent: window1
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index a9aaa11581..08666e9d3d 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   scale1
     "slider"
     parent: window1
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index 16e8d824c4..e1bc6b8ab4 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -6,14 +6,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   box1
     "filler"
     parent: window1