diff --git a/mysql-test/r/client_xml.result b/mysql-test/r/client_xml.result
index ed5e8f2c1b8..b7bca426e65 100644
--- a/mysql-test/r/client_xml.result
+++ b/mysql-test/r/client_xml.result
@@ -1,3 +1,4 @@
+drop table if exists t1;
 create table t1 (
 `a&b` int,
 `a<b` int,
diff --git a/mysql-test/t/client_xml.test b/mysql-test/t/client_xml.test
index 8ee63a6131b..81cd5a079ad 100644
--- a/mysql-test/t/client_xml.test
+++ b/mysql-test/t/client_xml.test
@@ -1,6 +1,10 @@
 # Can't run with embedded server
 -- source include/not_embedded.inc
 
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
 # Test of the xml output of the 'mysql' and 'mysqldump' clients -- makes
 # sure that basic encoding issues are handled properly
 create table t1 (