diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index dcf17e4bf52..ba9ba2833f6 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -6,7 +6,7 @@ select ((@id := kill_id) - kill_id) from t1;
 0
 kill @id;
 select 1;
-ERROR HY000: MySQL server has gone away
+Got one of the listed errors
 select ((@id := kill_id) - kill_id) from t1;
 ((@id := kill_id) - kill_id)
 0
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 4afb60a7bdd..1fec41d8ee4 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -27,7 +27,7 @@ connection con1;
 
 --disable_reconnect
 # this statement should fail
---error 2006
+--error 2006,2013
 select 1;
 --enable_reconnect
 # this should work, and we should have a new connection_id()