diff --git a/mysql-test/suite/innodb/t/innodb-isolation.test b/mysql-test/suite/innodb/t/innodb-isolation.test
index 0a647df6be3..13cab90be1b 100644
--- a/mysql-test/suite/innodb/t/innodb-isolation.test
+++ b/mysql-test/suite/innodb/t/innodb-isolation.test
@@ -271,6 +271,9 @@ ALTER TABLE t4 DISCARD TABLESPACE;
 --error ER_TABLESPACE_DISCARDED
 SELECT COUNT(*) FROM t4;

+--disable_query_log
+call mtr.add_suppression(".*The table .* doesn't have a corresponding tablespace.*");
+--enable_query_log

 --echo #
 --echo # Test the interaction of a repeatable read transaction
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test
index c2fc5c03598..a40c0bdd9f0 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522.test
@@ -8,7 +8,7 @@
 call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot calculate statistics for table `test`\.`t1` because the \.ibd file is missing");
 call mtr.add_suppression("Got error -1 when reading table '.*'");
 call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'.*");
-call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded");
+call mtr.add_suppression(".*The table .* doesn't have a corresponding tablespace.*");
 call mtr.add_suppression("InnoDB: Unable to import tablespace `test`\.`t1` because it already exists.  Please DISCARD the tablespace before IMPORT.");
 --enable_query_log

diff --git a/mysql-test/suite/innodb_zip/t/wl5522_zip.test b/mysql-test/suite/innodb_zip/t/wl5522_zip.test
index 4318f948c6f..a02abefeedf 100644
--- a/mysql-test/suite/innodb_zip/t/wl5522_zip.test
+++ b/mysql-test/suite/innodb_zip/t/wl5522_zip.test
@@ -12,6 +12,7 @@
 --disable_query_log
 call mtr.add_suppression("\\[Warning\\] InnoDB: cannot calculate statistics for table `test`\.`t1` because the \.ibd file is missing");
 call mtr.add_suppression("\\[ERROR\\] InnoDB: Unable to import tablespace `test`\.`t1` because it already exists.  Please DISCARD the tablespace before IMPORT.");
+call mtr.add_suppression(".*The table .* doesn't have a corresponding tablespace.*");
 --enable_query_log

 --disable_warnings

 diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
index b2e5fe74dab..07868d18dfe 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@@ -1169,6 +1169,9 @@ ALTER TABLE t1 ADD INDEX(c1);
 ALTER TABLE t1 DISCARD PARTITION p2 TABLESPACE;
 --error ER_TABLESPACE_DISCARDED
 SELECT COUNT(*)FROM t1,t1 AS b WHERE t1.c1=''AND t1.c2=b.c1;
+--disable_query_log
+call mtr.add_suppression(".*The table .* doesn't have a corresponding tablespace.*");
+--enable_query_log

 #Named partitions
 CREATE TABLE t2 (c1 int,c2 CHAR (1),c3 date,key(c1)) ENGINE=InnoDB