diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index e9eb50fc805..8c26ea1ff82 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -12694,3 +12694,4 @@ SELECT * FROM t1 ORDER BY a;
 a	b
 1	NULL
 2	NULL
+DROP TABLE t1;
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 4bdcca81b74..d698107382e 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1786,6 +1786,7 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 
 DROP TABLE t2;
+DROP TABLE t1;
 
 # -- End of test case for Bug#21380.
 
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 268f290ddca..a1e7d403035 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -1478,6 +1478,7 @@ NULL
 1
 2
 DROP TABLE t1;
+DROP TABLE t2;
 CREATE TABLE t1 ( a INT, b INT );
 SELECT b c, (SELECT a FROM t1 WHERE b = c)
 FROM t1;
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index b42c8446a32..7139d95ab49 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1598,3 +1598,4 @@ CREATE TABLE t1(a INT NOT NULL AUTO_INCREMENT, b BLOB, KEY(a)) ENGINE=archive;
 INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL);
 FLUSH TABLE t1;
 SELECT * FROM t1 ORDER BY a;
+DROP TABLE t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 09170cbc4f5..e986495624b 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1380,6 +1380,7 @@ SHOW CREATE TABLE t2;
 --echo
 
 DROP TABLE t2;
+DROP TABLE t1;
 
 --echo
 --echo # -- End of test case for Bug#21380.
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index 3211db5d6ed..d5dad3c1032 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -945,6 +945,7 @@ EXPLAIN SELECT b from t2 GROUP BY b;
 SELECT b from t2 GROUP BY b;
 
 DROP TABLE t1;
+DROP TABLE t2;
 
 #
 # Bug #31797: error while parsing subqueries -- WHERE is parsed as HAVING