diff --git a/localtests/tz-datetime/create.sql b/localtests/tz-datetime/create.sql
new file mode 100644
index 0000000..5575062
--- /dev/null
+++ b/localtests/tz-datetime/create.sql
@@ -0,0 +1,42 @@
+drop table if exists gh_ost_test;
+create table gh_ost_test (
+  id int auto_increment,
+  i int not null,
+  ts0 timestamp default current_timestamp,
+  ts1 timestamp,
+  ts2 timestamp,
+  dt  datetime,
+  updated tinyint unsigned default 0,
+  primary key(id),
+  key i_idx(i)
+) auto_increment=1;
+
+drop event if exists gh_ost_test;
+delimiter ;;
+create event gh_ost_test
+  on schedule every 1 second
+  starts current_timestamp
+  ends current_timestamp + interval 60 second
+  on completion not preserve
+  enable
+  do
+begin
+  insert into gh_ost_test values (null, 11, null, now(), now(), '2010-10-20 10:20:30', 0);
+  update gh_ost_test set ts2=now() + interval 10 minute, updated = 1 where i = 11 order by id desc limit 1;
+
+  set session time_zone='system';
+  insert into gh_ost_test values (null, 11, null, now(), now(), '2010-10-20 10:20:30', 0);
+  update gh_ost_test set ts2=now() + interval 10 minute, updated = 1 where i = 13 order by id desc limit 1;
+
+  set session time_zone='+00:00';
+  insert into gh_ost_test values (null, 17, null, now(), now(), '2010-10-20 10:20:30', 0);
+  update gh_ost_test set ts2=now() + interval 10 minute, updated = 1 where i = 17 order by id desc limit 1;
+
+  set session time_zone='-03:00';
+  insert into gh_ost_test values (null, 19, null, now(), now(), '2010-10-20 10:20:30', 0);
+  update gh_ost_test set ts2=now() + interval 10 minute, updated = 1 where i = 19 order by id desc limit 1;
+
+  set session time_zone='+05:00';
+  insert into gh_ost_test values (null, 23, null, now(), now(), '2010-10-20 10:20:30', 0);
+  update gh_ost_test set ts2=now() + interval 10 minute, updated = 1 where i = 23 order by id desc limit 1;
+end ;;
diff --git a/localtests/tz-datetime/extra_args b/localtests/tz-datetime/extra_args
new file mode 100644
index 0000000..90a96d8
--- /dev/null
+++ b/localtests/tz-datetime/extra_args
@@ -0,0 +1 @@
+--alter="change column dt dt timestamp not null"