diff --git a/mysql-test/main/alter_table_lock.result b/mysql-test/main/alter_table_lock.result
index ce6097c9ada..620fca23315 100644
--- a/mysql-test/main/alter_table_lock.result
+++ b/mysql-test/main/alter_table_lock.result
@@ -11,8 +11,6 @@ ERROR 42S02: Table 'test.x' doesn't exist
 SET SESSION max_session_mem_used= 8192;
 LOCK TABLE t1 WRITE;
 ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
-Warnings:
-Note	1054	Unknown column 'b' in 't1'
 SET SESSION max_session_mem_used = @max_session_mem_used_save;
 UNLOCK TABLES;
 DROP TABLE t1;
diff --git a/mysql-test/main/alter_table_lock.test b/mysql-test/main/alter_table_lock.test
index f1f60e38b61..bd26c1ac7d0 100644
--- a/mysql-test/main/alter_table_lock.test
+++ b/mysql-test/main/alter_table_lock.test
@@ -14,9 +14,13 @@ SELECT * FROM t1;
 ALTER TABLE x MODIFY xx INT;
 
 SET SESSION max_session_mem_used= 8192;
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 LOCK TABLE t1 WRITE;
 
+--disable_warnings
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
+--enable_warnings
 
 SET SESSION max_session_mem_used = @max_session_mem_used_save;
 UNLOCK TABLES;