diff --git a/localtests/datetime-to-timestamp-pk-fail/create.sql b/localtests/datetime-to-timestamp-pk-fail/create.sql
index 7977ff4a3..c6025433a 100644
--- a/localtests/datetime-to-timestamp-pk-fail/create.sql
+++ b/localtests/datetime-to-timestamp-pk-fail/create.sql
@@ -3,9 +3,9 @@ create table gh_ost_test (
   id int unsigned auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp,
+  ts1 timestamp null,
   dt2 datetime,
-  t   datetime,
+  t   datetime default current_timestamp,
   updated tinyint unsigned default 0,
   primary key(id, t),
   key i_idx(i)
diff --git a/localtests/datetime-to-timestamp-pk-fail/extra_args b/localtests/datetime-to-timestamp-pk-fail/extra_args
index 6b3f977f3..e68dde467 100644
--- a/localtests/datetime-to-timestamp-pk-fail/extra_args
+++ b/localtests/datetime-to-timestamp-pk-fail/extra_args
@@ -1 +1 @@
---alter="change column t t timestamp not null"
+--alter="change column t t timestamp default current_timestamp"
diff --git a/localtests/datetime-to-timestamp/create.sql b/localtests/datetime-to-timestamp/create.sql
index 95ca5d321..95add7a31 100644
--- a/localtests/datetime-to-timestamp/create.sql
+++ b/localtests/datetime-to-timestamp/create.sql
@@ -3,9 +3,9 @@ create table gh_ost_test (
   id int unsigned auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp,
+  ts1 timestamp null,
   dt2 datetime,
-  t   datetime,
+  t   datetime null,
   updated tinyint unsigned default 0,
   primary key(id),
   key i_idx(i)
diff --git a/localtests/datetime-to-timestamp/extra_args b/localtests/datetime-to-timestamp/extra_args
index 6b3f977f3..ee9bcf07c 100644
--- a/localtests/datetime-to-timestamp/extra_args
+++ b/localtests/datetime-to-timestamp/extra_args
@@ -1 +1 @@
---alter="change column t t timestamp not null"
+--alter="change column t t timestamp null"
diff --git a/localtests/enum-pk/create.sql b/localtests/enum-pk/create.sql
index 4ba77435c..5cf7906bf 100644
--- a/localtests/enum-pk/create.sql
+++ b/localtests/enum-pk/create.sql
@@ -2,7 +2,7 @@ drop table if exists gh_ost_test;
 create table gh_ost_test (
   id int auto_increment,
   i int not null,
-  e enum('red', 'green', 'blue', 'orange') null default null collate 'utf8_bin',
+  e enum('red', 'green', 'blue', 'orange') not null default 'red' collate 'utf8_bin',
   primary key(id, e)
 ) auto_increment=1;
 
diff --git a/localtests/timestamp-to-datetime/create.sql b/localtests/timestamp-to-datetime/create.sql
index 10c83d643..f3bce34b9 100644
--- a/localtests/timestamp-to-datetime/create.sql
+++ b/localtests/timestamp-to-datetime/create.sql
@@ -3,7 +3,7 @@ create table gh_ost_test (
   id int auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp,
+  ts1 timestamp default current_timestamp,
   dt2 datetime,
   t   datetime,
   updated tinyint unsigned default 0,
diff --git a/localtests/timestamp/create.sql b/localtests/timestamp/create.sql
index 2377ebfd4..cba713516 100644
--- a/localtests/timestamp/create.sql
+++ b/localtests/timestamp/create.sql
@@ -3,8 +3,8 @@ create table gh_ost_test (
   id int auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp,
-  ts2 timestamp,
+  ts1 timestamp default current_timestamp,
+  ts2 timestamp default current_timestamp,
   updated tinyint unsigned default 0,
   primary key(id),
   key i_idx(i)
diff --git a/localtests/tz-datetime-ts/create.sql b/localtests/tz-datetime-ts/create.sql
index 510a0651e..a5c3251aa 100644
--- a/localtests/tz-datetime-ts/create.sql
+++ b/localtests/tz-datetime-ts/create.sql
@@ -3,7 +3,7 @@ create table gh_ost_test (
   id int auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp,
+  ts1 timestamp default current_timestamp,
   dt2 datetime,
   t   datetime,
   updated tinyint unsigned default 0,
diff --git a/localtests/tz-datetime-ts/extra_args b/localtests/tz-datetime-ts/extra_args
index 6b3f977f3..f350007c5 100644
--- a/localtests/tz-datetime-ts/extra_args
+++ b/localtests/tz-datetime-ts/extra_args
@@ -1 +1 @@
---alter="change column t t timestamp not null"
+--alter="change column t t timestamp not null default current_timestamp"
diff --git a/localtests/tz/create.sql b/localtests/tz/create.sql
index f908e6e7b..aec997f5c 100644
--- a/localtests/tz/create.sql
+++ b/localtests/tz/create.sql
@@ -3,8 +3,8 @@ create table gh_ost_test (
   id int auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp,
-  ts2 timestamp,
+  ts1 timestamp default current_timestamp,
+  ts2 timestamp default current_timestamp,
   updated tinyint unsigned default 0,
   primary key(id),
   key i_idx(i)