diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index d0fb340c9f..6e42ed500d 100644
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -489,7 +489,7 @@ for details, visit http://www.gnu.org/licenses/gpl.html
         layer: widget
         alpha: 1
         <AtkImage>
-        image size: 20 x 20
+        image size: -1 x -1
         image description: (null)
         <AtkAction>
         action 0 name: click
diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index 13df1efa03..53bb37b6eb 100644
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -56,7 +56,7 @@ window1
       layer: widget
       alpha: 1
       <AtkImage>
-      image size: 20 x 20
+      image size: -1 x -1
       image description: (null)
       <AtkAction>
       action 0 name: click
@@ -73,7 +73,7 @@ window1
       layer: widget
       alpha: 1
       <AtkImage>
-      image size: 20 x 20
+      image size: -1 x -1
       image description: (null)
       <AtkAction>
       action 0 name: click
@@ -90,7 +90,7 @@ window1
       layer: widget
       alpha: 1
       <AtkImage>
-      image size: 20 x 20
+      image size: -1 x -1
       image description: (null)
       <AtkAction>
       action 0 name: click
@@ -107,7 +107,7 @@ window1
       layer: widget
       alpha: 1
       <AtkImage>
-      image size: 20 x 20
+      image size: -1 x -1
       image description: (null)
       <AtkAction>
       action 0 name: click
@@ -124,7 +124,7 @@ window1
       layer: widget
       alpha: 1
       <AtkImage>
-      image size: 20 x 20
+      image size: -1 x -1
       image description: (null)
       <AtkAction>
       action 0 name: click
@@ -141,7 +141,7 @@ window1
       layer: widget
       alpha: 1
       <AtkImage>
-      image size: 20 x 20
+      image size: -1 x -1
       image description: (null)
       <AtkAction>
       action 0 name: click
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 1db200d748..aaa9349cde 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -1331,7 +1331,7 @@ window1
         layer: widget
         alpha: 1
         <AtkImage>
-        image size: 20 x 20
+        image size: -1 x -1
         image description: (null)
         <AtkAction>
         action 0 name: click
@@ -1365,7 +1365,7 @@ window1
         layer: widget
         alpha: 1
         <AtkImage>
-        image size: 20 x 20
+        image size: -1 x -1
         image description: (null)
         <AtkAction>
         action 0 name: click
diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt
index 7681245a5a..c901c29886 100644
--- a/testsuite/a11y/menus.txt
+++ b/testsuite/a11y/menus.txt
@@ -31,7 +31,7 @@ window1
       action 0 description: Clicks the menuitem
       action 0 keybinding: <Alt>f;<Alt>f;
       <AtkSelection>
-      imagemenuitem1
+      menuitema1
         "menu item"
         parent: menuitem1
         index: 0
@@ -46,7 +46,7 @@ window1
         action 0 description: Clicks the menuitem
         action 0 keybinding: n;<Alt>f:n;
         <AtkSelection>
-      imagemenuitem2
+      menuitema2
         "menu item"
         parent: menuitem1
         index: 1
diff --git a/testsuite/a11y/menus.ui b/testsuite/a11y/menus.ui
index d641a67c12..3445b72d88 100644
--- a/testsuite/a11y/menus.ui
+++ b/testsuite/a11y/menus.ui
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon-name">go-up</property>
-    <property name="icon-size">5</property>
-  </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <child>
@@ -25,7 +19,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkMenuItem" id="imagemenuitem1">
+                  <object class="GtkMenuItem" id="menuitema1">
                     <property name="label" translatable="yes">_New</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -34,12 +28,11 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkMenuItem" id="imagemenuitem2">
+                  <object class="GtkMenuItem" id="menuitema2">
                     <property name="label" translatable="yes">bla</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="image">image1</property>
                   </object>
                 </child>
                 <child>
diff --git a/testsuite/a11y/notebook.txt b/testsuite/a11y/notebook.txt
index cc9e5ff0ae..fd805c97c4 100644
--- a/testsuite/a11y/notebook.txt
+++ b/testsuite/a11y/notebook.txt
@@ -36,12 +36,11 @@ window1
         layer: widget
         alpha: 1
         <AtkImage>
-        image size: 20 x 20
+        image size: -1 x -1
         image description: (null)
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the button
-        action 0 keybinding: <Alt>y
     unnamed-GtkNotebookPageAccessible-1
       "page tab"
       parent: notebook1
@@ -61,9 +60,8 @@ window1
         layer: widget
         alpha: 1
         <AtkImage>
-        image size: 20 x 20
+        image size: -1 x -1
         image description: (null)
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the button
-        action 0 keybinding: <Alt>n