diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index e4e7aec..ab6999a 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -7727,7 +7727,9 @@
      the assert on the mismatch of info->mach and
      bfd_get_mach (current_program_space->exec_bfd ()) in
      default_print_insn.  */
-  if (current_program_space->exec_bfd () != NULL)
+  if (current_program_space->exec_bfd () != NULL
+      && (current_program_space->exec_bfd ()->arch_info
+	  == gdbarch_bfd_arch_info (gdbarch)))
     info->flags |= USER_SPECIFIED_MACHINE_TYPE;
 
   return default_print_insn (memaddr, info);
diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp
index 61a6c0e..3622243 100644
--- a/gdb/testsuite/gdb.gdb/unittest.exp
+++ b/gdb/testsuite/gdb.gdb/unittest.exp
@@ -51,13 +51,6 @@
 	    set num_ran $expect_out(1,string)
 	    set num_failed $expect_out(2,string)
 	    gdb_assert "$num_ran > 0" "$test, ran some tests"
-
-	    if { $binfile != "" } {
-		# There's a known issue here (see PR gdb/27891),
-		# however, we should not have more than 1 failure.
-		gdb_assert "$num_failed <= 1" "$test, failed no more than 1"
-		setup_kfail "gdb/27891" "*-*-*"
-	    }
 	    gdb_assert "$num_failed == 0" "$test, failed none"
 	}
 	-re "Selftests have been disabled for this build.\r\n$gdb_prompt $" {