diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result
index 782be3834d1..6ae4a06399c 100644
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@@ -282,7 +282,6 @@ INSERT INTO t1 SELECT * FROM t2;
 connection default;
 REPLACE INTO t2 SELECT * FROM t2;
 connection con1;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 disconnect con1;
 connect  con2,localhost,root,,test;
 INSERT INTO t3 VALUES (1);
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test
index 85a792822dd..58ad1caaeef 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -414,7 +414,7 @@ INSERT INTO t1 SELECT * FROM t2;
 REPLACE INTO t2 SELECT * FROM t2;
 
 --connection con1
---error ER_LOCK_DEADLOCK
+--error 0, ER_LOCK_DEADLOCK, ER_LOCK_WAIT_TIMEOUT
 --reap
 --disconnect con1