diff --git a/testsuite/gtk/focus-chain/widget-factory.tab b/testsuite/gtk/focus-chain/widget-factory.tab
index 75fa0c4f2b..468e4560fd 100644
--- a/testsuite/gtk/focus-chain/widget-factory.tab
+++ b/testsuite/gtk/focus-chain/widget-factory.tab
@@ -11,8 +11,6 @@ GtkCheckButton
 GtkCheckButton
 GtkCheckButton
 GtkCheckButton
-GtkCheckButton
-GtkCheckButton
 GtkToggleButton
 GtkToggleButton
 GtkToggleButton
diff --git a/testsuite/gtk/focus-chain/widget-factory.tab-backward b/testsuite/gtk/focus-chain/widget-factory.tab-backward
index c6d9b10e24..dd7582889a 100644
--- a/testsuite/gtk/focus-chain/widget-factory.tab-backward
+++ b/testsuite/gtk/focus-chain/widget-factory.tab-backward
@@ -20,8 +20,6 @@ GtkCheckButton
 GtkCheckButton
 GtkCheckButton
 GtkCheckButton
-GtkCheckButton
-GtkCheckButton
 GtkSpinButton GtkText
 GtkToggleButton
 GtkToggleButton
diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index afdc95ec9d..c090dbf228 100644
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -2235,13 +2235,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkCheckButton" id="grid_button">
+                                      <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="list_button">
+                                      <object class="GtkToggleButton" id="list_button">
                                         <property name="active">1</property>
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>
diff --git a/testsuite/gtk/focus-chain/widget-factory2.ui b/testsuite/gtk/focus-chain/widget-factory2.ui
index 9f267283cf..cfc151da11 100644
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -2236,13 +2236,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkCheckButton" id="grid_button">
+                                      <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="list_button">
+                                      <object class="GtkToggleButton" id="list_button">
                                         <property name="active">1</property>
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>
diff --git a/testsuite/gtk/focus-chain/widget-factory3.tab b/testsuite/gtk/focus-chain/widget-factory3.tab
index 2e8e5755c4..19c6ffc741 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.tab
+++ b/testsuite/gtk/focus-chain/widget-factory3.tab
@@ -3,8 +3,8 @@ GtkLabel
 GtkScrolledWindow
 GtkToggleButton
 GtkToggleButton
-GtkCheckButton
-GtkCheckButton
+GtkToggleButton
+GtkToggleButton
 GtkButton
 GtkToggleButton
 GtkListBoxRow
diff --git a/testsuite/gtk/focus-chain/widget-factory3.tab-backward b/testsuite/gtk/focus-chain/widget-factory3.tab-backward
index 343000efe7..96fc15c219 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.tab-backward
+++ b/testsuite/gtk/focus-chain/widget-factory3.tab-backward
@@ -20,8 +20,8 @@ GtkEntry GtkText
 GtkListBoxRow
 GtkToggleButton
 GtkButton
-GtkCheckButton
-GtkCheckButton
+GtkToggleButton
+GtkToggleButton
 GtkToggleButton
 GtkToggleButton
 GtkScrolledWindow
diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index ab50aed216..9f454b90c2 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -2236,16 +2236,14 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkCheckButton" id="grid_button">
-                                        <property name="draw-indicator">0</property>
+                                      <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="list_button">
+                                      <object class="GtkToggleButton" id="list_button">
                                         <property name="active">1</property>
-                                        <property name="draw-indicator">0</property>
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>
                                       </object>