diff --git a/testsuite/css/nodes/notebook-arrows.ui b/testsuite/css/nodes/notebook-arrows.ui
index a296ac3e68..4b3bd70fab 100644
--- a/testsuite/css/nodes/notebook-arrows.ui
+++ b/testsuite/css/nodes/notebook-arrows.ui
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
-        <property name="scrollable">True</property>
+        <property name="scrollable">1</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook-arrows2.ui b/testsuite/css/nodes/notebook-arrows2.ui
index 5098dbb08f..bd563af34a 100644
--- a/testsuite/css/nodes/notebook-arrows2.ui
+++ b/testsuite/css/nodes/notebook-arrows2.ui
@@ -1,42 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <!-- <property name="type">popup</property> -->
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
-        <property name="scrollable">True</property>
+        <property name="scrollable">1</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <property name="page">-1</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/css/nodes/notebook.bottom.ltr.ui b/testsuite/css/nodes/notebook.bottom.ltr.ui
index 176d2b8664..927ec1f252 100644
--- a/testsuite/css/nodes/notebook.bottom.ltr.ui
+++ b/testsuite/css/nodes/notebook.bottom.ltr.ui
@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <property name="tab-pos">bottom</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.bottom.rtl.ui b/testsuite/css/nodes/notebook.bottom.rtl.ui
index 176d2b8664..927ec1f252 100644
--- a/testsuite/css/nodes/notebook.bottom.rtl.ui
+++ b/testsuite/css/nodes/notebook.bottom.rtl.ui
@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <property name="tab-pos">bottom</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.left.ltr.ui b/testsuite/css/nodes/notebook.left.ltr.ui
index 6c2d820ac0..3b654a680b 100644
--- a/testsuite/css/nodes/notebook.left.ltr.ui
+++ b/testsuite/css/nodes/notebook.left.ltr.ui
@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <property name="tab-pos">left</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.left.rtl.ui b/testsuite/css/nodes/notebook.left.rtl.ui
index 6c2d820ac0..3b654a680b 100644
--- a/testsuite/css/nodes/notebook.left.rtl.ui
+++ b/testsuite/css/nodes/notebook.left.rtl.ui
@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <property name="tab-pos">left</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.right.ltr.ui b/testsuite/css/nodes/notebook.right.ltr.ui
index 7bea7d947e..26877095d7 100644
--- a/testsuite/css/nodes/notebook.right.ltr.ui
+++ b/testsuite/css/nodes/notebook.right.ltr.ui
@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <property name="tab-pos">right</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.right.rtl.ui b/testsuite/css/nodes/notebook.right.rtl.ui
index 7bea7d947e..26877095d7 100644
--- a/testsuite/css/nodes/notebook.right.rtl.ui
+++ b/testsuite/css/nodes/notebook.right.rtl.ui
@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <property name="tab-pos">right</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.top.ltr.ui b/testsuite/css/nodes/notebook.top.ltr.ui
index a080a52d1d..a51b936a42 100644
--- a/testsuite/css/nodes/notebook.top.ltr.ui
+++ b/testsuite/css/nodes/notebook.top.ltr.ui
@@ -1,52 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/notebook.top.rtl.ui b/testsuite/css/nodes/notebook.top.rtl.ui
index a080a52d1d..a51b936a42 100644
--- a/testsuite/css/nodes/notebook.top.rtl.ui
+++ b/testsuite/css/nodes/notebook.top.rtl.ui
@@ -1,52 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkNotebook">
-        <property name="visible">True</property>
         <child>
-          <object class="GtkButton">
-            <property name="name">page1</property>
-            <property name="label" translatable="yes">Yes</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="name">tab1</property>
-            <property name="label" translatable="yes">Tab 1</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page1</property>
+                <property name="label" translatable="yes">Yes</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel">
+                <property name="name">tab1</property>
+                <property name="label" translatable="yes">Tab 1</property>
+              </object>
+            </property>
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="name">page2</property>
-            <property name="label" translatable="yes">No</property>
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="tab2">
-            <property name="name">tab2</property>
-            <property name="label" translatable="yes">Tab 2</property>
-            <property name="visible">True</property>
+          <object class="GtkNotebookPage">
+            <property name="child">
+              <object class="GtkButton">
+                <property name="name">page2</property>
+                <property name="label" translatable="yes">No</property>
+              </object>
+            </property>
+            <property name="tab">
+              <object class="GtkLabel" id="tab2">
+                <property name="name">tab2</property>
+                <property name="label" translatable="yes">Tab 2</property>
+              </object>
+            </property>
           </object>
         </child>
         <child type="action-start">
           <object class="GtkButton">
             <property name="name">start</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
         <child type="action-end">
           <object class="GtkButton">
             <property name="name">end</property>
             <property name="label" translatable="yes">Action</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>