diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index c260e2ff333c798609be25f0e8416ba5de13fc7c..ebcc1155fc96670bf98d20cc79f3d2df947e023c 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -5567,7 +5567,7 @@ INSERT INTO t1(x, y) VALUES
 DELETE FROM t1 WHERE x = 3;
 DELETE FROM t1 WHERE x > 7;
 INSERT INTO t1(x, y) VALUES(3, 33);
-SELECT @time := Sys_start FROM t1 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07' WHERE x = 3 AND y = 33;
+SELECT @time := Sys_start FROM t1 WHERE x = 3 AND y = 33 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07';
 @time := Sys_start
 Sys_start
 SELECT x, y FROM t1;
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 3d2c689591e5d62f3f32137356e30728fbd16bea..8f3055850b94ace505edbe7685ddd2512962aac2 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -4693,7 +4693,7 @@ DELETE FROM t1 WHERE x > 7;
 --real_sleep 1
 INSERT INTO t1(x, y) VALUES(3, 33);
 --replace_column 1 Sys_start
-SELECT @time := Sys_start FROM t1 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07' WHERE x = 3 AND y = 33;
+SELECT @time := Sys_start FROM t1 WHERE x = 3 AND y = 33 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07';
 SELECT x, y FROM t1;
 SET @query=CONCAT('SELECT x, y FROM t1 FOR SYSTEM_TIME FROM TIMESTAMP \'0-0-0 0:0:0\' TO TIMESTAMP \'', @time, '\'');
 PREPARE stmt_t1 FROM @query;