diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 3c57010258..345178bc5f 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -1403,9 +1403,9 @@ test_widget (void)
   const gchar *buffer =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
+    "    <property name=\"focus-widget\">button1</property>"
     "    <child>"
     "      <object class=\"GtkButton\" id=\"button1\">"
-    "         <property name=\"has-focus\">True</property>"
     "      </object>"
     "    </child>"
     "  </object>"
@@ -1473,9 +1473,7 @@ test_widget (void)
   builder = builder_new_from_string (buffer, -1, NULL);
   button1 = gtk_builder_get_object (builder, "button1");
 
-#if 0
   g_assert (gtk_widget_has_focus (GTK_WIDGET (button1)));
-#endif
   window1 = gtk_builder_get_object (builder, "window1");
   gtk_widget_destroy (GTK_WIDGET (window1));
   
diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui b/testsuite/reftests/border-image-url-scaled.ref.ui
index 35e1ad4db3..71226b4c8b 100644
--- a/testsuite/reftests/border-image-url-scaled.ref.ui
+++ b/testsuite/reftests/border-image-url-scaled.ref.ui
@@ -5,7 +5,6 @@
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
-        <property name="has_focus">1</property>
         <property name="receives_default">1</property>
         <style>
           <class name="button-not-image"/>
@@ -13,7 +12,6 @@
         <child>
           <object class="GtkButton" id="button2">
             <property name="name">reference</property>
-            <property name="has_focus">1</property>
             <property name="receives_default">1</property>
             <style>
               <class name="button-not-image2"/>
@@ -22,7 +20,6 @@
               <object class="GtkButton" id="button3">
                 <property name="name">reference</property>
                 <property name="label" translatable="yes">Hello World</property>
-                <property name="has_focus">1</property>
                 <property name="receives_default">1</property>
                 <style>
                   <class name="button-not-image3"/>
diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui
index 3cda7f1118..3333406d07 100644
--- a/testsuite/reftests/border-image-url-scaled.ui
+++ b/testsuite/reftests/border-image-url-scaled.ui
@@ -6,7 +6,6 @@
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="has_focus">1</property>
         <property name="receives_default">1</property>
         <style>
           <class name="button-image"/>
diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui
index 18a9857838..746db4a7a7 100644
--- a/testsuite/reftests/border-image-url.ref.ui
+++ b/testsuite/reftests/border-image-url.ref.ui
@@ -2,11 +2,11 @@
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
+    <property name="focus-widget">button1</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="has_focus">1</property>
         <property name="receives_default">1</property>
         <style>
           <class name="button-not-image"/>
diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui
index 3cda7f1118..8772f9f943 100644
--- a/testsuite/reftests/border-image-url.ui
+++ b/testsuite/reftests/border-image-url.ui
@@ -2,11 +2,11 @@
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
+    <property name="focus-widget">button1</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="has_focus">1</property>
         <property name="receives_default">1</property>
         <style>
           <class name="button-image"/>
diff --git a/testsuite/reftests/css-match-inherit.ref.ui b/testsuite/reftests/css-match-inherit.ref.ui
index d655578b6e..6e13775567 100644
--- a/testsuite/reftests/css-match-inherit.ref.ui
+++ b/testsuite/reftests/css-match-inherit.ref.ui
@@ -6,7 +6,6 @@
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="has_focus">1</property>
         <property name="receives_default">1</property>
         <style>
           <class name="testinherit"/>
diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui
index 8a9082ecbe..b5f23fcbe1 100644
--- a/testsuite/reftests/css-match-inherit.ui
+++ b/testsuite/reftests/css-match-inherit.ui
@@ -6,7 +6,6 @@
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
         <property name="label" translatable="yes">Hello World</property>
-        <property name="has_focus">1</property>
         <property name="receives_default">1</property>
       </object>
     </child>