diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result
index d434f5c32ce..1faf8834980 100644
--- a/mysql-test/r/sp_notembedded.result
+++ b/mysql-test/r/sp_notembedded.result
@@ -1,3 +1,4 @@
+drop table if exists t1,t3;
 drop procedure if exists bug4902|
 create procedure bug4902()
 begin
@@ -204,3 +205,4 @@ drop procedure bug10100pv|
 drop procedure bug10100pd|
 drop procedure bug10100pc|
 drop view v1|
+drop table t3;
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
index 3854297ec0c..ead33ff9968 100644
--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/t/sp_notembedded.test
@@ -1,6 +1,10 @@
 # Can't test with embedded server
 -- source include/not_embedded.inc
 
+--sleep 2
+--disable_warnings
+drop table if exists t1,t3;
+--enable_warnings
 delimiter |;
 
 #
@@ -260,3 +264,4 @@ drop procedure bug10100pc|
 drop view v1|
 
 delimiter ;|
+drop table t3;