diff --git a/mysql-test/main/information_schema_parameters.result b/mysql-test/main/information_schema_parameters.result
index 69a777d6db0..a265f73d788 100644
--- a/mysql-test/main/information_schema_parameters.result
+++ b/mysql-test/main/information_schema_parameters.result
@@ -674,7 +674,7 @@ DTD_IDENTIFIER	char(20)
 ROUTINE_TYPE	FUNCTION
 SHOW STATUS LIKE 'handler_read%next';
 Variable_name	Value
-Handler_read_next	54
+Handler_read_next	count_routines
 Handler_read_rnd_next	3
 #
 # We cannot use the index due to CONCAT(), and filtering by SPECIFIC_NAME
@@ -686,7 +686,7 @@ WHERE CONCAT(SPECIFIC_SCHEMA) = 'i_s_parameters_test'
   AND SPECIFIC_NAME = 'not_existing_proc';
 SHOW STATUS LIKE 'handler_read%next';
 Variable_name	Value
-Handler_read_next	54
+Handler_read_next	count_routines
 Handler_read_rnd_next	1
 #
 # Now the index must be used
diff --git a/mysql-test/main/information_schema_parameters.test b/mysql-test/main/information_schema_parameters.test
index 0c9d94e97f6..f689ee4eddc 100644
--- a/mysql-test/main/information_schema_parameters.test
+++ b/mysql-test/main/information_schema_parameters.test
@@ -291,12 +291,15 @@ USE i_s_parameters_test;
 CREATE FUNCTION test_func5 (s CHAR(20)) RETURNS VARCHAR(30)
   RETURN CONCAT('XYZ, ' ,s);
 
+--let count_routines = `select count(*) from information_schema.routines`
+
 --echo #
 --echo # We cannot use the index due to missing condition on SPECIFIC_SCHEMA,
 --echo # but we will use SPECIFIC_NAME for filtering records from mysql.proc
 FLUSH STATUS;
 query_vertical SELECT * FROM INFORMATION_SCHEMA.PARAMETERS
   WHERE SPECIFIC_NAME = 'test_func5';
+--replace_result $count_routines count_routines
 SHOW STATUS LIKE 'handler_read%next';
 
 --echo #
@@ -307,8 +310,8 @@ FLUSH STATUS;
 query_vertical SELECT * FROM INFORMATION_SCHEMA.PARAMETERS
   WHERE CONCAT(SPECIFIC_SCHEMA) = 'i_s_parameters_test'
   AND SPECIFIC_NAME = 'not_existing_proc';
+--replace_result $count_routines count_routines
 SHOW STATUS LIKE 'handler_read%next';
-
 --echo #
 --echo # Now the index must be used
 FLUSH STATUS;
diff --git a/mysql-test/main/information_schema_routines.result b/mysql-test/main/information_schema_routines.result
index d316dd7acee..b5b43db71ce 100644
--- a/mysql-test/main/information_schema_routines.result
+++ b/mysql-test/main/information_schema_routines.result
@@ -898,7 +898,7 @@ COLLATION_CONNECTION	latin1_swedish_ci
 DATABASE_COLLATION	latin1_swedish_ci
 SHOW STATUS LIKE 'handler_read%next';
 Variable_name	Value
-Handler_read_next	54
+Handler_read_next	count_routines
 Handler_read_rnd_next	2
 #
 # We cannot use the index due to CONCAT(), and filtering by ROUTINE_NAME
@@ -910,7 +910,7 @@ WHERE CONCAT(ROUTINE_SCHEMA) = 'i_s_routines_test'
   AND ROUTINE_NAME = 'not_existing_proc';
 SHOW STATUS LIKE 'handler_read%next';
 Variable_name	Value
-Handler_read_next	54
+Handler_read_next	count_routines
 Handler_read_rnd_next	1
 #
 # Now the index must be used
diff --git a/mysql-test/main/information_schema_routines.test b/mysql-test/main/information_schema_routines.test
index ea64c8b0d02..f9512409811 100644
--- a/mysql-test/main/information_schema_routines.test
+++ b/mysql-test/main/information_schema_routines.test
@@ -264,6 +264,8 @@ CREATE FUNCTION test_func5 (s CHAR(20)) RETURNS VARCHAR(30)
   RETURN CONCAT('XYZ, ' ,s);
 
 
+--let count_routines = `select count(*) from information_schema.routines`
+
 --echo #
 --echo # We cannot use the index due to missing condition on SPECIFIC_SCHEMA,
 --echo # but we will use ROUTINE_NAME for filtering records from mysql.proc
@@ -271,6 +273,7 @@ FLUSH STATUS;
 --replace_column 24 <created> 25 <modified>
 query_vertical SELECT * FROM INFORMATION_SCHEMA.ROUTINES
   WHERE ROUTINE_NAME = 'test_func5';
+--replace_result $count_routines count_routines
 SHOW STATUS LIKE 'handler_read%next';
 
 --echo #
@@ -281,6 +284,7 @@ FLUSH STATUS;
 query_vertical SELECT * FROM INFORMATION_SCHEMA.ROUTINES
   WHERE CONCAT(ROUTINE_SCHEMA) = 'i_s_routines_test'
   AND ROUTINE_NAME = 'not_existing_proc';
+--replace_result $count_routines count_routines
 SHOW STATUS LIKE 'handler_read%next';
 
 --echo #