diff --git a/testsuite/tools/simplify-data-3to4/grid.expected b/testsuite/tools/simplify-data-3to4/grid.expected
index 0e76b6e643..955cf2c541 100644
--- a/testsuite/tools/simplify-data-3to4/grid.expected
+++ b/testsuite/tools/simplify-data-3to4/grid.expected
@@ -9,6 +9,15 @@
             <property name="active">1</property>
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
+            <property name="expand">True</property>
+            <property name="margin-top">10</property>
+            <property name="margin-right">10</property>
+            <property name="margin-bottom">10</property>
+            <property name="margin-left">10</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
         </child>
         <child>
@@ -18,6 +27,7 @@
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
             </layout>
           </object>
         </child>
@@ -28,6 +38,7 @@
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
             </layout>
           </object>
         </child>
@@ -40,6 +51,7 @@
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
             </layout>
           </object>
         </child>
@@ -50,6 +62,7 @@
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
             </layout>
           </object>
         </child>
@@ -64,6 +77,7 @@
             </child>
             <layout>
               <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
             </layout>
           </object>
         </child>
@@ -73,6 +87,7 @@
             <property name="receives_default">1</property>
             <property name="label">Text Button</property>
             <layout>
+              <property name="left_attach">0</property>
               <property name="top_attach">1</property>
             </layout>
           </object>
diff --git a/testsuite/tools/simplify-data-3to4/grid.ui b/testsuite/tools/simplify-data-3to4/grid.ui
index 66bbf562b2..5a4fd2831a 100644
--- a/testsuite/tools/simplify-data-3to4/grid.ui
+++ b/testsuite/tools/simplify-data-3to4/grid.ui
@@ -13,6 +13,8 @@
             <property name="active">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="expand">True</property>
+            <property name="margin">10</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/testsuite/tools/simplify-data-3to4/office-runner.expected b/testsuite/tools/simplify-data-3to4/office-runner.expected
index 6b32fa1616..fe60c0cd2a 100644
--- a/testsuite/tools/simplify-data-3to4/office-runner.expected
+++ b/testsuite/tools/simplify-data-3to4/office-runner.expected
@@ -25,6 +25,10 @@
                     <child>
                       <object class="GtkImage" id="run_image">
                         <property name="vexpand">1</property>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
                     </child>
                     <child>
@@ -50,6 +54,7 @@
                         </attributes>
                         <layout>
                           <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
                         </layout>
                       </object>
                     </child>
@@ -77,6 +82,7 @@
                         <property name="vexpand">1</property>
                         <layout>
                           <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
                         </layout>
                       </object>
                     </child>
@@ -89,6 +95,10 @@
                           <attribute name="scale" value="10"></attribute>
                           <attribute name="font-features" value="tnum 1"></attribute>
                         </attributes>
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
                       </object>
                     </child>
                   </object>
@@ -109,7 +119,12 @@
                     <property name="row_spacing">12</property>
                     <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkImage" id="trophy_image"/>
+                      <object class="GtkImage" id="trophy_image">
+                        <layout>
+                          <property name="left_attach">0</property>
+                          <property name="top_attach">0</property>
+                        </layout>
+                      </object>
                     </child>
                     <child>
                       <object class="GtkBox" id="box2">
@@ -162,6 +177,7 @@
                         </child>
                         <layout>
                           <property name="left_attach">1</property>
+                          <property name="top_attach">0</property>
                         </layout>
                       </object>
                     </child>
diff --git a/testsuite/tools/simplify-data-3to4/popover.expected b/testsuite/tools/simplify-data-3to4/popover.expected
index 9f2cafebc7..84263bd86f 100644
--- a/testsuite/tools/simplify-data-3to4/popover.expected
+++ b/testsuite/tools/simplify-data-3to4/popover.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkPopover" id="popover">
-    <property name="autohide">0</property>
+    <property name="modal">0</property>
   </object>
 </interface>