diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 6e727f16b6..9aad57aa21 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -82,7 +82,7 @@ test_parser (void)
   
   error = NULL;
   gtk_builder_add_from_string (builder, "<interface invalid=\"X\"/>", -1, &error);
-  g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_ATTRIBUTE);
+  g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE);
   g_error_free (error);
 
   error = NULL;
diff --git a/testsuite/gtk/ui/celllayout5.expected b/testsuite/gtk/ui/celllayout5.expected
index 027a052673..e47a1a9402 100644
--- a/testsuite/gtk/ui/celllayout5.expected
+++ b/testsuite/gtk/ui/celllayout5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:9:15 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/dialog5.expected b/testsuite/gtk/ui/dialog5.expected
index 027a052673..3a72c79f55 100644
--- a/testsuite/gtk/ui/dialog5.expected
+++ b/testsuite/gtk/ui/dialog5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:11:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/filefilter10.expected b/testsuite/gtk/ui/filefilter10.expected
index 027a052673..6219088dbd 100644
--- a/testsuite/gtk/ui/filefilter10.expected
+++ b/testsuite/gtk/ui/filefilter10.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:4:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/infobar5.expected b/testsuite/gtk/ui/infobar5.expected
index 65dee44077..f1a9ff9be7 100644
--- a/testsuite/gtk/ui/infobar5.expected
+++ b/testsuite/gtk/ui/infobar5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <worbl>
+<input>:9:13 Unhandled tag: <worbl>
diff --git a/testsuite/gtk/ui/label5.expected b/testsuite/gtk/ui/label5.expected
index 027a052673..40c5dbc96e 100644
--- a/testsuite/gtk/ui/label5.expected
+++ b/testsuite/gtk/ui/label5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:6:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/levelbar6.expected b/testsuite/gtk/ui/levelbar6.expected
index 027a052673..40c5dbc96e 100644
--- a/testsuite/gtk/ui/levelbar6.expected
+++ b/testsuite/gtk/ui/levelbar6.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:6:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/scale7.expected b/testsuite/gtk/ui/scale7.expected
index 7661a45af9..fa79467bc8 100644
--- a/testsuite/gtk/ui/scale7.expected
+++ b/testsuite/gtk/ui/scale7.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <foo>
+<input>:6:11 Unhandled tag: <foo>
diff --git a/testsuite/gtk/ui/test1.expected b/testsuite/gtk/ui/test1.expected
index dcfceaea70..4db4708f19 100644
--- a/testsuite/gtk/ui/test1.expected
+++ b/testsuite/gtk/ui/test1.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <style>
+<input>:4:11 Unhandled tag: <style>
diff --git a/testsuite/gtk/ui/test2.expected b/testsuite/gtk/ui/test2.expected
index 871e994750..2f800fa225 100644
--- a/testsuite/gtk/ui/test2.expected
+++ b/testsuite/gtk/ui/test2.expected
@@ -1,2 +1,2 @@
-ERROR: gtk-builder-error-quark 3
-<input>:3:1 'get-type' is not a valid attribute of <object>
+ERROR: g-markup-error-quark 4
+.:3:1 attribute 'get-type' invalid for element 'object'
diff --git a/testsuite/gtk/ui/test4.expected b/testsuite/gtk/ui/test4.expected
index 45d5b67492..69e96d9ec9 100644
--- a/testsuite/gtk/ui/test4.expected
+++ b/testsuite/gtk/ui/test4.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <random>
+<input>:3:43 Unhandled tag: <random>
diff --git a/testsuite/gtk/ui/test6.expected b/testsuite/gtk/ui/test6.expected
index 2acd0d0fd4..20d6002eb5 100644
--- a/testsuite/gtk/ui/test6.expected
+++ b/testsuite/gtk/ui/test6.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 8
-Duplicate object ID 'foo' on line 5 (previously on line 3)
+.:5:1 Duplicate object ID 'foo' (previously on line 3)
diff --git a/testsuite/gtk/ui/test7.expected b/testsuite/gtk/ui/test7.expected
index df08169b7e..8f0795b97f 100644
--- a/testsuite/gtk/ui/test7.expected
+++ b/testsuite/gtk/ui/test7.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 4
-<input>:4:1 'object' is not a valid tag here
+<input>:4:1 <object> is not a valid tag here