diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 1016cf27c18..4ddc7e2ab87 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -429,6 +429,16 @@ set session insert_id=20;
 select @@session.insert_id;
 @@session.insert_id
 20
+set session last_insert_id=100;
+select @@session.insert_id;
+@@session.insert_id
+20
+select @@session.last_insert_id;
+@@session.last_insert_id
+100
+select @@session.insert_id;
+@@session.insert_id
+20
 set @@session.insert_id=@save_insert_id;
 select @@session.insert_id;
 @@session.insert_id
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index d0def5af8d0..68efcafd1e0 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -308,6 +308,12 @@ select @@session.insert_id;
 set @save_insert_id=@@session.insert_id;
 set session insert_id=20;
 select @@session.insert_id;
+
+set session last_insert_id=100;
+select @@session.insert_id;
+select @@session.last_insert_id;
+select @@session.insert_id;
+
 set @@session.insert_id=@save_insert_id;
 select @@session.insert_id;