diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bfa1afc7f0..f0549c2676 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-19  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.python/lib-types.exp: Make xfail more strict.
+
 2020-02-19  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.ada/funcall_ref.exp: Replace xfail setup by unsupported check.
diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
index ab1d9d8dad..d2d5f9b2b9 100644
--- a/gdb/testsuite/gdb.python/lib-types.exp
+++ b/gdb/testsuite/gdb.python/lib-types.exp
@@ -103,8 +103,15 @@ gdb_test_multiple "python print (str (basic_type_typedef_const_typedef_class1_ob
 # test nested typedef/reference stripping
 gdb_test_no_output "python typedef_const_typedef_class1_ref_obj = gdb.parse_and_eval ('typedef_const_typedef_class1_ref_obj')"
 gdb_test_no_output "python basic_type_typedef_const_typedef_class1_ref_obj = gdb.types.get_basic_type (typedef_const_typedef_class1_ref_obj.type)"
-if {[test_compiler_info {gcc-*-*}]} { setup_xfail gcc/55641 *-*-* }
-gdb_test "python print (str (typedef_const_typedef_class1_ref_obj.type))" "\[\r\n\]+typedef_const_typedef_class1_ref"
+gdb_test_multiple "python print (str (typedef_const_typedef_class1_ref_obj.type))" "" {
+    -re -wrap "\[\r\n\]+const typedef_const_typedef_class1_ref" {
+	# Compiler with PR gcc/55641.
+	xfail $gdb_test_name
+    }
+    -re -wrap "\[\r\n\]+typedef_const_typedef_class1_ref" {
+	pass $gdb_test_name
+    }
+}
 set test "nested typedef/ref stripping"
 gdb_test_multiple "python print (str (basic_type_typedef_const_typedef_class1_ref_obj))" $test {
     -re "\[\r\n\]+class1\[\r\n\]+$gdb_prompt $" {