diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 7bec98b0687..cd8378a504d 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -563,11 +563,12 @@ select * from t2;
 b
 1
 drop table t1,t2;
+use test;
 create table t1 (a int);
 create table t1 select * from t1;
-INSERT TABLE 't1' isn't allowed in FROM table list
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
 create table t2 union = (t1) select * from t1;
-INSERT TABLE 't1' isn't allowed in FROM table list
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
 flush tables with read lock;
 unlock tables;
 drop table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 5677a9cccb2..c37fccef70b 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -467,6 +467,8 @@ drop table t1,t2;
 # This tests two additional possible errors and a hang if 
 # an improper fix is present.
 #
+connection default;
+use test;
 create table t1 (a int);
 --error 1093
 create table t1 select * from t1;