diff --git a/mysql-test/main/order_by_innodb.result b/mysql-test/main/order_by_innodb.result
index 17d39eb12e6..12390e2979c 100644
--- a/mysql-test/main/order_by_innodb.result
+++ b/mysql-test/main/order_by_innodb.result
@@ -159,6 +159,12 @@ insert into t2 values
 (1,2,'2019-03-05 00:00:00','2019-03-06 00:00:00'),
 (2,3,'2019-03-05 00:00:00','2019-03-06 00:00:00'),
 (3,3,'2019-03-06 00:00:00','2019-03-05 00:00:00');
+analyze table t1,t2 persistent for all;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+test.t2	analyze	status	Engine-independent statistics collected
+test.t2	analyze	status	OK
 select
 t1.id,t2.id
 from
@@ -177,6 +183,10 @@ id	id
 2	1
 3	3
 create index for_latest_sort on t2 (d1 desc, d2 desc, id desc);
+analyze table t2 persistent for all;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
+test.t2	analyze	status	OK
 select
 t1.id,t2.id
 from
diff --git a/mysql-test/main/order_by_innodb.test b/mysql-test/main/order_by_innodb.test
index 29b796f67bc..aa8c16a126c 100644
--- a/mysql-test/main/order_by_innodb.test
+++ b/mysql-test/main/order_by_innodb.test
@@ -148,6 +148,7 @@ insert into t2 values
   (2,3,'2019-03-05 00:00:00','2019-03-06 00:00:00'),
   (3,3,'2019-03-06 00:00:00','2019-03-05 00:00:00');
 
+analyze table t1,t2 persistent for all;
 select
   t1.id,t2.id
 from
@@ -163,6 +164,7 @@ from
                 );
 
 create index for_latest_sort on t2 (d1 desc, d2 desc, id desc);
+analyze table t2 persistent for all;
 
 select
   t1.id,t2.id
diff --git a/mysql-test/main/order_by_optimizer_innodb.result b/mysql-test/main/order_by_optimizer_innodb.result
index 0b62ba997d8..17d5d82e1c9 100644
--- a/mysql-test/main/order_by_optimizer_innodb.result
+++ b/mysql-test/main/order_by_optimizer_innodb.result
@@ -24,6 +24,10 @@ REPEAT('filler-data-', 10),
 REPEAT('filler-data-', 10)
 from 
 t1;
+analyze table t2 persistent for all;
+Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
+test.t2	analyze	status	OK
 select pk1, count(*) from t2 group by pk1;
 pk1	count(*)
 0	1
diff --git a/mysql-test/main/order_by_optimizer_innodb.test b/mysql-test/main/order_by_optimizer_innodb.test
index 90430d11549..4726b8f6fad 100644
--- a/mysql-test/main/order_by_optimizer_innodb.test
+++ b/mysql-test/main/order_by_optimizer_innodb.test
@@ -33,6 +33,7 @@ select
 from 
   t1;
 
+analyze table t2 persistent for all;
 select pk1, count(*) from t2 group by pk1;
 
 --echo # The following should use range(ux_pk1_fd5), two key parts (key_len=5+8=13)