diff --git a/tests/mydialog.ui b/tests/mydialog.ui
new file mode 100644
index 0000000000..b6766e0794
--- /dev/null
+++ b/tests/mydialog.ui
@@ -0,0 +1,23 @@
+<interface>
+  <template class="MyDialog" parent="GtkDialog">
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="visible">True</property>
+        <property name="label">_Abort</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="go_button">
+        <property name="visible">True</property>
+        <property name="label">_Go</property>
+        <property name="use_underline">True</property>
+        <property name="can_default">True</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="cancel">cancel_button</action-widget>
+      <action-widget response="apply" default="True">go_button</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/tests/mydialog2.ui b/tests/mydialog2.ui
new file mode 100644
index 0000000000..aa1f990358
--- /dev/null
+++ b/tests/mydialog2.ui
@@ -0,0 +1,14 @@
+<interface>
+  <template class="MyDialog2" parent="GtkDialog">
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <child>
+          <object class="GtkLabel" id="content">
+            <property name="visible">True</property>
+            <property name="label">template content</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/tests/testdialog.c b/tests/testdialog.c
index 59d76381b3..e38cc0cd2d 100644
--- a/tests/testdialog.c
+++ b/tests/testdialog.c
@@ -216,7 +216,6 @@ show_dialog_from_template (GtkWindow *parent)
                          "transient-for", parent,
                          NULL);
 
-  add_buttons (dialog);
   add_content (dialog);
 
   gtk_dialog_run (GTK_DIALOG (dialog));
@@ -238,7 +237,6 @@ show_dialog_flex_template (GtkWindow *parent)
                          "use-header-bar", use_header,
                          NULL);
 
-  add_buttons (dialog);
   add_content (dialog);
 
   gtk_dialog_run (GTK_DIALOG (dialog));