diff --git a/mysql-test/r/statistics.result b/mysql-test/r/statistics.result
index 424dec3bb9d..59af26014c6 100644
--- a/mysql-test/r/statistics.result
+++ b/mysql-test/r/statistics.result
@@ -1,4 +1,5 @@
 drop table if exists t1,t2;
+set @save_optimizer_use_stat_tables=@@optimizer_use_stat_tables;
 CREATE VIEW table_stat AS
 SELECT * FROM mysql.table_stat;
 CREATE VIEW column_stat AS
@@ -453,3 +454,4 @@ DELETE FROM mysql.index_stat;
 DROP VIEW test.table_stat;
 DROP VIEW test.column_stat;
 DROP VIEW test.index_stat;
+set optimizer_use_stat_tables=@save_optimizer_use_stat_tables;
diff --git a/mysql-test/t/statistics.test b/mysql-test/t/statistics.test
index 9ea57aca14a..0a32fcde881 100644
--- a/mysql-test/t/statistics.test
+++ b/mysql-test/t/statistics.test
@@ -3,6 +3,8 @@
 drop table if exists t1,t2;
 --enable_warnings
 
+set @save_optimizer_use_stat_tables=@@optimizer_use_stat_tables;
+
 CREATE VIEW table_stat AS
 SELECT * FROM mysql.table_stat;
  
@@ -286,5 +288,6 @@ DROP VIEW test.table_stat;
 DROP VIEW test.column_stat;
 DROP VIEW test.index_stat;
 
-   
+set optimizer_use_stat_tables=@save_optimizer_use_stat_tables;
+
     
\ No newline at end of file