diff --git a/mysql-test/suite/sys_vars/r/open_files_limit_basic.result b/mysql-test/suite/sys_vars/r/open_files_limit_basic.result
index b136fdf2e20..7ca75b8d283 100644
--- a/mysql-test/suite/sys_vars/r/open_files_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/open_files_limit_basic.result
@@ -1,20 +1,20 @@
 select @@global.open_files_limit;
 @@global.open_files_limit
-1024
+#
 select @@session.open_files_limit;
 ERROR HY000: Variable 'open_files_limit' is a GLOBAL variable
 show global variables like 'open_files_limit';
 Variable_name	Value
-open_files_limit	1024
+open_files_limit	#
 show session variables like 'open_files_limit';
 Variable_name	Value
-open_files_limit	1024
+open_files_limit	#
 select * from information_schema.global_variables where variable_name='open_files_limit';
 VARIABLE_NAME	VARIABLE_VALUE
-OPEN_FILES_LIMIT	1024
+OPEN_FILES_LIMIT	#
 select * from information_schema.session_variables where variable_name='open_files_limit';
 VARIABLE_NAME	VARIABLE_VALUE
-OPEN_FILES_LIMIT	1024
+OPEN_FILES_LIMIT	#
 set global open_files_limit=1;
 ERROR HY000: Variable 'open_files_limit' is a read only variable
 set session open_files_limit=1;
diff --git a/mysql-test/suite/sys_vars/t/open_files_limit_basic.test b/mysql-test/suite/sys_vars/t/open_files_limit_basic.test
index 50c0b2d5b6e..bac3c8f6685 100644
--- a/mysql-test/suite/sys_vars/t/open_files_limit_basic.test
+++ b/mysql-test/suite/sys_vars/t/open_files_limit_basic.test
@@ -1,17 +1,17 @@
 #
 # show the global and session values;
 #
---replace_result 3072 1024 16384 1024
+--replace_column 1 #
 select @@global.open_files_limit;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.open_files_limit;
---replace_result 3072 1024 16384 1024
+--replace_column 2 #
 show global variables like 'open_files_limit';
---replace_result 3072 1024 16384 1024
+--replace_column 2 #
 show session variables like 'open_files_limit';
---replace_result 3072 1024 16384 1024
+--replace_column 2 #
 select * from information_schema.global_variables where variable_name='open_files_limit';
---replace_result 3072 1024 16384 1024
+--replace_column 2 #
 select * from information_schema.session_variables where variable_name='open_files_limit';
 
 #