diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index dccc440027..571e6cb1c1 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -367,10 +367,10 @@ test_sizegroup (void)
     "      <object class=\"GtkBox\" id=\"vbox1\">"
     "        <property name=\"orientation\">vertical</property>"
     "        <child>"
-    "          <object class=\"GtkRadioButton\" id=\"radio1\"/>"
+    "          <object class=\"GtkCheckButton\" id=\"radio1\"/>"
     "        </child>"
     "        <child>"
-    "          <object class=\"GtkRadioButton\" id=\"radio2\"/>"
+    "          <object class=\"GtkCheckButton\" id=\"radio2\"/>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -405,10 +405,10 @@ test_sizegroup (void)
     "      <object class=\"GtkBox\" id=\"vbox1\">"
     "        <property name=\"orientation\">vertical</property>"
     "        <child>"
-    "          <object class=\"GtkRadioButton\" id=\"radio1\"/>"
+    "          <object class=\"GtkCheckButton\" id=\"radio1\"/>"
     "        </child>"
     "        <child>"
-    "          <object class=\"GtkRadioButton\" id=\"radio2\"/>"
+    "          <object class=\"GtkChekcButton\" id=\"radio2\"/>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -651,7 +651,6 @@ test_types (void)
     "  <object class=\"GtkListStore\" id=\"liststore\"/>"
     "  <object class=\"GtkNotebook\" id=\"notebook\"/>"
     "  <object class=\"GtkProgressBar\" id=\"progressbar\"/>"
-    "  <object class=\"GtkRadioButton\" id=\"radiobutton\"/>"
     "  <object class=\"GtkSizeGroup\" id=\"sizegroup\"/>"
     "  <object class=\"GtkScrolledWindow\" id=\"scrolledwindow\"/>"
     "  <object class=\"GtkSpinButton\" id=\"spinbutton\"/>"
diff --git a/testsuite/gtk/focus-chain/widget-factory.tab b/testsuite/gtk/focus-chain/widget-factory.tab
index 355e660961..75fa0c4f2b 100644
--- a/testsuite/gtk/focus-chain/widget-factory.tab
+++ b/testsuite/gtk/focus-chain/widget-factory.tab
@@ -8,9 +8,9 @@ GtkToggleButton
 GtkToggleButton
 GtkSpinButton GtkText
 GtkCheckButton
-GtkRadioButton
 GtkCheckButton
-GtkRadioButton
+GtkCheckButton
+GtkCheckButton
 GtkCheckButton
 GtkCheckButton
 GtkToggleButton
diff --git a/testsuite/gtk/focus-chain/widget-factory.tab-backward b/testsuite/gtk/focus-chain/widget-factory.tab-backward
index 7e25d9a025..c6d9b10e24 100644
--- a/testsuite/gtk/focus-chain/widget-factory.tab-backward
+++ b/testsuite/gtk/focus-chain/widget-factory.tab-backward
@@ -18,9 +18,9 @@ GtkToggleButton
 GtkToggleButton
 GtkCheckButton
 GtkCheckButton
-GtkRadioButton
 GtkCheckButton
-GtkRadioButton
+GtkCheckButton
+GtkCheckButton
 GtkCheckButton
 GtkSpinButton GtkText
 GtkToggleButton
diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index 1f7f92b96a..afdc95ec9d 100644
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -680,7 +680,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton1">
+                                  <object class="GtkCheckButton" id="radiobutton1">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
@@ -690,7 +690,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton2">
+                                  <object class="GtkCheckButton" id="radiobutton2">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
@@ -711,7 +711,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton4">
+                                  <object class="GtkCheckButton" id="radiobutton4">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
@@ -721,7 +721,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton5">
+                                  <object class="GtkCheckButton" id="radiobutton5">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
@@ -2235,13 +2235,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkRadioButton" id="grid_button">
+                                      <object class="GtkCheckButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkRadioButton" id="list_button">
+                                      <object class="GtkCheckButton" 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 82298267dd..9f267283cf 100644
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -681,7 +681,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton1">
+                                  <object class="GtkCheckButton" id="radiobutton1">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
@@ -691,7 +691,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton2">
+                                  <object class="GtkCheckButton" id="radiobutton2">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
@@ -712,7 +712,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton4">
+                                  <object class="GtkCheckButton" id="radiobutton4">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
@@ -722,7 +722,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton5">
+                                  <object class="GtkCheckButton" id="radiobutton5">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
@@ -2236,13 +2236,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkRadioButton" id="grid_button">
+                                      <object class="GtkCheckButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkRadioButton" id="list_button">
+                                      <object class="GtkCheckButton" 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 b73858c989..2e8e5755c4 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
-GtkRadioButton
-GtkRadioButton
+GtkCheckButton
+GtkCheckButton
 GtkButton
 GtkToggleButton
 GtkListBoxRow
diff --git a/testsuite/gtk/focus-chain/widget-factory3.tab-backward b/testsuite/gtk/focus-chain/widget-factory3.tab-backward
index 968e04c717..343000efe7 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
-GtkRadioButton
-GtkRadioButton
+GtkCheckButton
+GtkCheckButton
 GtkToggleButton
 GtkToggleButton
 GtkScrolledWindow
diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index d7a5bc973d..ab50aed216 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -681,7 +681,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton1">
+                                  <object class="GtkCheckButton" id="radiobutton1">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
@@ -691,7 +691,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton2">
+                                  <object class="GtkCheckButton" id="radiobutton2">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
@@ -701,7 +701,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton3">
+                                  <object class="GtkCheckButton" id="radiobutton3">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
@@ -712,7 +712,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton4">
+                                  <object class="GtkCheckButton" id="radiobutton4">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
@@ -722,7 +722,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton5">
+                                  <object class="GtkCheckButton" id="radiobutton5">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
@@ -733,7 +733,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </object>
                                 </child>
                                 <child>
-                                  <object class="GtkRadioButton" id="radiobutton6">
+                                  <object class="GtkCheckButton" id="radiobutton6">
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
@@ -2236,14 +2236,14 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkRadioButton" id="grid_button">
+                                      <object class="GtkCheckButton" id="grid_button">
                                         <property name="draw-indicator">0</property>
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkRadioButton" id="list_button">
+                                      <object class="GtkCheckButton" id="list_button">
                                         <property name="active">1</property>
                                         <property name="draw-indicator">0</property>
                                         <property name="group">grid_button</property>
diff --git a/testsuite/reftests/button-wrapping.ref.ui b/testsuite/reftests/button-wrapping.ref.ui
index ff466e1a61..3c0bfe282f 100644
--- a/testsuite/reftests/button-wrapping.ref.ui
+++ b/testsuite/reftests/button-wrapping.ref.ui
@@ -38,7 +38,7 @@ World</property>
             <property name="resize-start-child">0</property>
             <property name="position_set">1</property>
             <child>
-              <object class="GtkRadioButton" id="radiobutton1">
+              <object class="GtkCheckButton" id="radiobutton1">
                 <property name="active">1</property>
                 <child>
                   <object class="GtkLabel" id="label2">
diff --git a/testsuite/reftests/button-wrapping.ui b/testsuite/reftests/button-wrapping.ui
index b1e7af8039..b68f193422 100644
--- a/testsuite/reftests/button-wrapping.ui
+++ b/testsuite/reftests/button-wrapping.ui
@@ -38,7 +38,7 @@
             <property name="resize-start-child">0</property>
             <property name="position_set">1</property>
             <child>
-              <object class="GtkRadioButton" id="radiobutton1">
+              <object class="GtkCheckButton" id="radiobutton1">
                 <property name="active">1</property>
                 <child>
                   <object class="GtkLabel" id="label2">