diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
index a904dc6e85b..5e50a715307 100644
--- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
@@ -2,11 +2,6 @@ SET @orig = @@global.innodb_buffer_pool_filename;
 SELECT @orig;
 @orig
 ib_buffer_pool
-SELECT variable_value
-FROM information_schema.global_status
-WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
-variable_value
-not started
 SET GLOBAL innodb_buffer_pool_filename = 'innodb_foobar_dump';
 SET GLOBAL innodb_buffer_pool_dump_now = ON;
 SET GLOBAL innodb_buffer_pool_filename = @orig;
diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
index 1b99a941611..5d2701081e8 100644
--- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
@@ -8,17 +8,7 @@
 SET @orig = @@global.innodb_buffer_pool_filename;
 SELECT @orig;
 
-# Make sure that --force-restart in the .opt file has worked and that
-# the value of this status variable is not something like
-# 'Buffer pool(s) dump completed at ' left from previous runs because if
-# it is then the following wait condition may be satisfied without the
-# dump actually being complete and file_exists may fail.
-let $status_var = innodb_buffer_pool_dump_status;
-let $status_var_value = not started;
--- source include/wait_for_status_var.inc
-SELECT variable_value
-FROM information_schema.global_status
-WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
+let $old_val=query_get_value(SHOW STATUS LIKE 'innodb_buffer_pool_dump_status', Value, 1);
 
 # Try with a non-default filename
 
@@ -29,9 +19,10 @@ SET GLOBAL innodb_buffer_pool_dump_now = ON;
 
 # Wait for the dump to complete
 let $wait_condition =
-  SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at '
+  SELECT variable_value LIKE 'Buffer pool(s) dump completed at %'
+     AND variable_value <> '$old_val'
   FROM information_schema.global_status
-  WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
+  WHERE variable_name = 'innodb_buffer_pool_dump_status';
 -- source include/wait_condition.inc
 
 -- file_exists $file