diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 69620d5d527..91d72045169 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -904,7 +904,7 @@ insert into mysqltest.t3 values(1);
 commit;
 drop database mysqltest;
 show tables from mysqltest;
-Got one of the listed errors
+ERROR 42000: Unknown database 'mysqltest'
 set autocommit=0;
 create table t1 (a int not null) engine= innodb;
 insert into t1 values(1),(2);
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 8d51af4f22f..3eaf408af0f 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -586,7 +586,7 @@ insert into mysqltest.t3 values(1);
 commit;
 drop database mysqltest;
 # Don't check error message
---error 12,12
+--error 1049
 show tables from mysqltest;
 
 #