diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 6c03ace3d27..ac280f301d8 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1415,7 +1415,8 @@ CREATE TABLE server_status (variable_name VARCHAR(64),
 variable_value DECIMAL(22,7));
 DROP EVENT IF EXISTS log_status;
 CREATE EVENT log_status
-ON SCHEDULE EVERY 1 SECOND
+ON SCHEDULE AT NOW()
+ON COMPLETION PRESERVE
 DO
 BEGIN
 INSERT INTO thread_status SELECT variable_name, variable_value FROM
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index bd1f4271c94..96a11b3061e 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1059,7 +1059,8 @@ DROP EVENT IF EXISTS log_status;
 DELIMITER $$;
 
 CREATE EVENT log_status
- ON SCHEDULE EVERY 1 SECOND
+ ON SCHEDULE AT NOW()
+ ON COMPLETION PRESERVE
  DO
  BEGIN
   INSERT INTO thread_status SELECT variable_name, variable_value FROM
@@ -1071,12 +1072,12 @@ information_schema.global_status;
 DELIMITER ;$$
 
 SET GLOBAL event_scheduler=1;
-sleep 1;
+let $wait_condition=select count(variable_name) != 0 from server_status;
+let $wait_timeout=30;
+--source include/wait_condition.inc
 SELECT * FROM thread_status WHERE variable_name LIKE 'SSL%' LIMIT 1,2;
 SELECT variable_name FROM server_status LIMIT 1,2;
 
-
-
 DROP EVENT log_status;
 DROP TABLE thread_status;
 DROP TABLE server_status;