diff --git a/mysql-test/suite/innodb/r/stored_fk.result b/mysql-test/suite/innodb/r/stored_fk.result
index 6fb1684497f..35524d5a88f 100644
--- a/mysql-test/suite/innodb/r/stored_fk.result
+++ b/mysql-test/suite/innodb/r/stored_fk.result
@@ -1,41 +1,50 @@
 # Create statement with FK on base column of stored column
 create table t1(f1 int, f2 int as(f1) stored,
 foreign key(f1) references t2(f1) on delete cascade)engine=innodb;
-ERROR HY000: Cannot add foreign key constraint
+ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
 # adding new stored column during alter table copy operation.
-create table t1(f1 int primary key);
+create table t1(f1 int primary key) engine=innodb;
 create table t2(f1 int not null, f2 int as (f1) virtual,
 foreign key(f1) references t1(f1) on update cascade)engine=innodb;
 alter table t2 add column f3 int as (f1) stored, add column f4 int as (f1) virtual;
-ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 150 - Foreign key constraint is incorrectly formed)
-drop table t2, t1;
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `f1` int(11) NOT NULL,
+  `f2` int(11) GENERATED ALWAYS AS (`f1`) VIRTUAL,
+  `f3` int(11) GENERATED ALWAYS AS (`f1`) STORED,
+  `f4` int(11) GENERATED ALWAYS AS (`f1`) VIRTUAL,
+  KEY `f1` (`f1`),
+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t2;
 # adding foreign key constraint for base columns during alter copy.
-create table t1(f1 int primary key);
-create table t2(f1 int not null, f2 int as (f1) stored);
+create table t2(f1 int not null, f2 int as (f1) stored) engine=innodb;
 alter table t2 add foreign key(f1) references t1(f1) on update cascade, algorithm=copy;
-ERROR HY000: Cannot add foreign key constraint
-drop table t2, t1;
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `f1` int(11) NOT NULL,
+  `f2` int(11) GENERATED ALWAYS AS (`f1`) STORED,
+  KEY `f1` (`f1`),
+  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t2;
 # adding foreign key constraint for base columns during online alter.
-create table t1(f1 int primary key);
-create table t2(f1 int not null, f2 int as (f1) stored);
+create table t2(f1 int not null, f2 int as (f1) stored) engine=innodb;
 set foreign_key_checks = 0;
 alter table t2 add foreign key(f1) references t1(f1) on update cascade, algorithm=inplace;
-ERROR HY000: Cannot add foreign key on the base column of stored column. 
-drop table t2, t1;
+ERROR 0A000: Cannot add foreign key on the base column of stored column
+drop table t2;
 # adding stored column via online alter.
-create table t1(f1 int primary key);
 create table t2(f1 int not null,
 foreign key(f1) references t1(f1) on update cascade)engine=innodb;
 alter table t2 add column f2 int as (f1) stored, algorithm=inplace;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 drop table t2, t1;
-set foreign_key_checks = 1;
 #
 # BUG#26731689 FK ON TABLE WITH GENERATED COLS: ASSERTION POS < N_DEF
 #
-SET @foreign_key_checks_saved = @@foreign_key_checks;
-SET foreign_key_checks=0;
-DROP TABLE IF EXISTS s,t;
 CREATE TABLE s (a INT, b INT GENERATED ALWAYS AS (0) STORED,  c INT,
 d INT GENERATED ALWAYS AS (0) VIRTUAL, e INT) ENGINE=innodb;
 CREATE TABLE t (a INT) ENGINE=innodb;
@@ -63,4 +72,3 @@ ERROR HY000: Failed to add the foreign key constaint. Missing index for constrai
 ALTER  TABLE t ADD PRIMARY KEY(a);
 ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
 DROP TABLE s,t;
-SET @@foreign_key_checks = @foreign_key_checks_saved;
diff --git a/mysql-test/suite/innodb/t/stored_fk.test b/mysql-test/suite/innodb/t/stored_fk.test
index da8df775523..b9c7c934555 100644
--- a/mysql-test/suite/innodb/t/stored_fk.test
+++ b/mysql-test/suite/innodb/t/stored_fk.test
@@ -1,55 +1,46 @@
 --source include/have_innodb.inc
 
 --echo # Create statement with FK on base column of stored column
---error ER_CANNOT_ADD_FOREIGN
+--error ER_CANT_CREATE_TABLE
 create table t1(f1 int, f2 int as(f1) stored,
 		foreign key(f1) references t2(f1) on delete cascade)engine=innodb;
 
 --echo # adding new stored column during alter table copy operation.
-create table t1(f1 int primary key);
+create table t1(f1 int primary key) engine=innodb;
 create table t2(f1 int not null, f2 int as (f1) virtual,
 		foreign key(f1) references t1(f1) on update cascade)engine=innodb;
 
---replace_regex  /Error on rename of '.*' to '.*'/Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME'/
---error ER_ERROR_ON_RENAME
+# MySQL 5.7 would refuse this
+#--error ER_ERROR_ON_RENAME
 alter table t2 add column f3 int as (f1) stored, add column f4 int as (f1) virtual;
-drop table t2, t1;
+show create table t2;
+drop table t2;
 
 --echo # adding foreign key constraint for base columns during alter copy.
-create table t1(f1 int primary key);
-create table t2(f1 int not null, f2 int as (f1) stored);
---error ER_CANNOT_ADD_FOREIGN
+create table t2(f1 int not null, f2 int as (f1) stored) engine=innodb;
+# MySQL 5.7 would refuse this
 alter table t2 add foreign key(f1) references t1(f1) on update cascade, algorithm=copy;
-drop table t2, t1;
+show create table t2;
+drop table t2;
 
 --echo # adding foreign key constraint for base columns during online alter.
-create table t1(f1 int primary key);
-create table t2(f1 int not null, f2 int as (f1) stored);
+create table t2(f1 int not null, f2 int as (f1) stored) engine=innodb;
 set foreign_key_checks = 0;
---error ER_CANNOT_ADD_FOREIGN_BASE_COL_STORED
+--error 138
 alter table t2 add foreign key(f1) references t1(f1) on update cascade, algorithm=inplace;
-drop table t2, t1;
+drop table t2;
 
 --echo # adding stored column via online alter.
-create table t1(f1 int primary key);
 create table t2(f1 int not null,
 		foreign key(f1) references t1(f1) on update cascade)engine=innodb;
 --error ER_ALTER_OPERATION_NOT_SUPPORTED
 alter table t2 add column f2 int as (f1) stored, algorithm=inplace;
 drop table t2, t1;
-set foreign_key_checks = 1;
 
 --echo #
 --echo # BUG#26731689 FK ON TABLE WITH GENERATED COLS: ASSERTION POS < N_DEF
 --echo #
 
-SET @foreign_key_checks_saved = @@foreign_key_checks;
-SET foreign_key_checks=0;
-
---disable_warnings
-DROP TABLE IF EXISTS s,t;
---enable_warnings
-
 CREATE TABLE s (a INT, b INT GENERATED ALWAYS AS (0) STORED,  c INT,
 		d INT GENERATED ALWAYS AS (0) VIRTUAL, e INT) ENGINE=innodb;
 
@@ -101,5 +92,3 @@ ALTER  TABLE t ADD PRIMARY KEY(a);
 ALTER TABLE s ADD CONSTRAINT c FOREIGN KEY (a) REFERENCES t(a) ON UPDATE SET null;
 
 DROP TABLE s,t;
-
-SET @@foreign_key_checks = @foreign_key_checks_saved;