diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result
index 2cb90679aed..e9d41c104dd 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/r/kill.result
@@ -25,7 +25,7 @@ select ((@id := kill_id) - kill_id) from t3;
 ((@id := kill_id) - kill_id)
 0
 kill @id;
-ERROR 08S01: Server shutdown in progress
+Got one of the listed errors
 drop table t1, t2, t3;
 select get_lock("a", 10);
 get_lock("a", 10)
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 9a8f61b1052..8302c767985 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -84,7 +84,7 @@ select ((@id := kill_id) - kill_id) from t3;
 kill @id;
 
 connection conn1;
--- error 1053
+-- error 1053,2013
 reap;
 
 connection default;