diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 21c553951f6..93c83c57c45 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -166,10 +166,10 @@ show variables like 'max_error_count';
 Variable_name	Value
 max_error_count	10
 drop table t1;
-create table t1 (id int) engine=NDB;
+create table t1 (id int) engine=Innodb;
 Warnings:
 Warning	1266	Using storage engine MyISAM for table 't1'
-alter table t1 engine=NDB;
+alter table t1 engine=Innodb;
 Warnings:
 Warning	1266	Using storage engine MyISAM for table 't1'
 drop table t1;
diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test
index eb5a24a8604..ce246e5543b 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/t/warnings.test
@@ -113,8 +113,8 @@ show variables like 'max_error_count';
 # Test for handler type
 #
 drop table t1;
-create table t1 (id int) engine=NDB;
-alter table t1 engine=NDB;
+create table t1 (id int) engine=Innodb;
+alter table t1 engine=Innodb;
 drop table t1;
 
 #