diff --git a/mysql-test/suite/federated/federated_archive.result b/mysql-test/suite/federated/federated_archive.result
index d67568ec11c..c2f43458126 100644
--- a/mysql-test/suite/federated/federated_archive.result
+++ b/mysql-test/suite/federated/federated_archive.result
@@ -20,13 +20,13 @@ id	name
 1	foo
 2	bar
 DELETE FROM federated.t1 WHERE id = 1;
-ERROR HY000: Got error 10000 'Error on remote system: 1031: Table storage engine for 'archive_table' doesn't have this option' from FEDERATED
+ERROR HY000: Got error 10000 'Error on remote system: 1031: Storage engine ARCHIVE of the table `federated`.`archive_table` doesn'' from FEDERATED
 SELECT * FROM federated.t1;
 id	name
 1	foo
 2	bar
 UPDATE federated.t1 SET name='baz' WHERE id = 1;
-ERROR HY000: Got error 10000 'Error on remote system: 1031: Table storage engine for 'archive_table' doesn't have this option' from FEDERATED
+ERROR HY000: Got error 10000 'Error on remote system: 1031: Storage engine ARCHIVE of the table `federated`.`archive_table` doesn'' from FEDERATED
 SELECT * FROM federated.t1;
 id	name
 1	foo
diff --git a/mysql-test/suite/innodb/r/innodb-autoinc-56228.result b/mysql-test/suite/innodb/r/innodb-autoinc-56228.result
index 492130d1f08..6a3fd85ebd3 100644
--- a/mysql-test/suite/innodb/r/innodb-autoinc-56228.result
+++ b/mysql-test/suite/innodb/r/innodb-autoinc-56228.result
@@ -1,9 +1,9 @@
 DROP TABLE IF EXISTS t1_56228;
 Warnings:
-Note	1051	Unknown table 't1_56228'
+Note	1051	Unknown table 'test.t1_56228'
 DROP TABLE IF EXISTS t2_56228;
 Warnings:
-Note	1051	Unknown table 't2_56228'
+Note	1051	Unknown table 'test.t2_56228'
 DROP FUNCTION IF EXISTS bug56228;
 Warnings:
 Note	1305	FUNCTION test.bug56228 does not exist
@@ -27,4 +27,4 @@ DROP FUNCTION bug56228;
 DROP TEMPORARY TABLE t2_56228;
 DROP TEMPORARY TABLE IF EXISTS t1_56228;
 Warnings:
-Note	1051	Unknown table 't1_56228'
+Note	1051	Unknown table 'test.t1_56228'