diff --git a/mysql-test/main/enforce_storage_engine.result b/mysql-test/main/enforce_storage_engine.result
index cc91daa73b9..37f22cf4331 100644
--- a/mysql-test/main/enforce_storage_engine.result
+++ b/mysql-test/main/enforce_storage_engine.result
@@ -45,7 +45,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 values (1,'abba');
 CREATE TABLE t2 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=Memory;
-ERROR 42000: Unknown storage engine 'MEMORY'
+ERROR HY000: The MariaDB server is running with the NO_ENGINE_SUBSTITUTION option so it cannot execute this statement
 SET SESSION sql_mode='';
 SET SESSION enforce_storage_engine=MyISAM;
 select @@session.enforce_storage_engine;
diff --git a/mysql-test/main/enforce_storage_engine.test b/mysql-test/main/enforce_storage_engine.test
index 7768ed1bf46..55bba15a343 100644
--- a/mysql-test/main/enforce_storage_engine.test
+++ b/mysql-test/main/enforce_storage_engine.test
@@ -26,7 +26,7 @@ CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=MyISA
 SHOW CREATE TABLE t1;
 INSERT INTO t1 values (1,'abba');
 
---error 1286
+--error ER_OPTION_PREVENTS_STATEMENT
 CREATE TABLE t2 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=Memory;
 
 SET SESSION sql_mode='';
diff --git a/mysql-test/main/enforce_storage_engine_opt.result b/mysql-test/main/enforce_storage_engine_opt.result
index 5f709427457..ba18a1bf169 100644
--- a/mysql-test/main/enforce_storage_engine_opt.result
+++ b/mysql-test/main/enforce_storage_engine_opt.result
@@ -11,5 +11,5 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 set session sql_mode='no_engine_substitution';
 create table t2 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
-ERROR 42000: Unknown storage engine 'MEMORY'
+ERROR HY000: The MariaDB server is running with the NO_ENGINE_SUBSTITUTION option so it cannot execute this statement
 drop table t1;
diff --git a/mysql-test/main/enforce_storage_engine_opt.test b/mysql-test/main/enforce_storage_engine_opt.test
index 7ca7f94d3dc..90c4a44a452 100644
--- a/mysql-test/main/enforce_storage_engine_opt.test
+++ b/mysql-test/main/enforce_storage_engine_opt.test
@@ -2,6 +2,6 @@ SET SQL_MODE="";
 create table t1 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
 show create table t1;
 set session sql_mode='no_engine_substitution';
---error 1286
+--error ER_OPTION_PREVENTS_STATEMENT
 create table t2 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
 drop table t1;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 9daeb582938..3f035defbd3 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -12304,8 +12304,7 @@ bool check_engine(THD *thd, const char *db_name,
   {
     if (no_substitution)
     {
-      const char *engine_name= ha_resolve_storage_engine_name(req_engine);
-      my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), engine_name);
+      my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "NO_ENGINE_SUBSTITUTION");
       DBUG_RETURN(TRUE);
     }
     *new_engine= enf_engine;