diff --git a/mysql-test/main/status.result b/mysql-test/main/status.result
index 6202648de99..290c74a355d 100644
--- a/mysql-test/main/status.result
+++ b/mysql-test/main/status.result
@@ -471,16 +471,21 @@ connection default;
 # All results below should be 1
 flush global status;
 flush session status;
+select $global_flush_status >= $local_flush_status as "1";
 1
 1
+flush session status;
+select $new_global_flush_status >= $global_flush_status as "1";
 1
 1
+select $new_local_flush_status < $global_flush_status as "1";
 1
 1
+flush global status;
+select $new_local_flush_status  >= $local_flush_status as "1";
 1
 1
+select $new_global_flush_status < $new_local_flush_status as "1";
 1
 1
-#
 # end of 11.5 tests
-#
diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test
index 33e73756b05..c9c1f97560c 100644
--- a/mysql-test/main/status.test
+++ b/mysql-test/main/status.test
@@ -487,15 +487,14 @@ let $local_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_
 
 --sleep 2
 
---disable_query_log
---eval select $global_flush_status >= $local_flush_status as "1"
+--evalp select $global_flush_status >= $local_flush_status as "1"
 flush session status;
 
 let $new_global_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`;
 let $new_local_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`;
 
---eval select $new_global_flush_status >= $global_flush_status as "1"
---eval select $new_local_flush_status < $global_flush_status as "1"
+--evalp select $new_global_flush_status >= $global_flush_status as "1"
+--evalp select $new_local_flush_status < $global_flush_status as "1"
 
 --sleep 2
 flush global status;
@@ -504,10 +503,7 @@ let $local_flush_status=$new_local_flush_status;
 let $new_global_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`;
 let $new_local_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`;
 
---eval select $new_local_flush_status  >= $local_flush_status as "1"
---eval select $new_global_flush_status < $new_local_flush_status as "1"
+--evalp select $new_local_flush_status  >= $local_flush_status as "1"
+--evalp select $new_global_flush_status < $new_local_flush_status as "1"
 
---enable_query_log
---echo #
 --echo # end of 11.5 tests
---echo #