diff --git a/test/expected/append-10.out b/test/expected/append-10.out
index 9acbc3d2c..1894b9eb5 100644
--- a/test/expected/append-10.out
+++ b/test/expected/append-10.out
@@ -113,7 +113,11 @@ SELECT create_hypertable('metrics_space','time','device_id',3);
  (6,public,metrics_space,t)
 (1 row)
 
-INSERT INTO metrics_space SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id FROM generate_series('2000-01-01'::date, '2000-01-14'::date, '5m'::interval) g1(time), generate_series(1,10,1) g2(device_id);
+INSERT INTO metrics_space
+SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id
+FROM generate_series('2000-01-01'::timestamptz, '2000-01-14'::timestamptz, '5m'::interval) g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 ANALYZE metrics_space;
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Apache License 2.0.
@@ -2134,7 +2138,11 @@ psql:include/append_query.sql:315: NOTICE:  adding not-null constraint to column
 (1 row)
 
 CREATE INDEX ON join_limit(time,device_id);
-INSERT INTO join_limit SELECT time, device_id FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time), generate_series(1,10,1) g2(device_id);
+INSERT INTO join_limit
+SELECT time, device_id
+FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 -- get 2nd chunk oid
 SELECT tableoid AS "CHUNK_OID" FROM join_limit WHERE time > '2000-01-07' ORDER BY time LIMIT 1
 \gset
diff --git a/test/expected/append-11.out b/test/expected/append-11.out
index 9dd893637..6c5ec97b0 100644
--- a/test/expected/append-11.out
+++ b/test/expected/append-11.out
@@ -113,7 +113,11 @@ SELECT create_hypertable('metrics_space','time','device_id',3);
  (6,public,metrics_space,t)
 (1 row)
 
-INSERT INTO metrics_space SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id FROM generate_series('2000-01-01'::date, '2000-01-14'::date, '5m'::interval) g1(time), generate_series(1,10,1) g2(device_id);
+INSERT INTO metrics_space
+SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id
+FROM generate_series('2000-01-01'::timestamptz, '2000-01-14'::timestamptz, '5m'::interval) g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 ANALYZE metrics_space;
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Apache License 2.0.
@@ -2134,7 +2138,11 @@ psql:include/append_query.sql:315: NOTICE:  adding not-null constraint to column
 (1 row)
 
 CREATE INDEX ON join_limit(time,device_id);
-INSERT INTO join_limit SELECT time, device_id FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time), generate_series(1,10,1) g2(device_id);
+INSERT INTO join_limit
+SELECT time, device_id
+FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 -- get 2nd chunk oid
 SELECT tableoid AS "CHUNK_OID" FROM join_limit WHERE time > '2000-01-07' ORDER BY time LIMIT 1
 \gset
diff --git a/test/expected/append-9.6.out b/test/expected/append-9.6.out
index ee71a4b91..732ac5bbf 100644
--- a/test/expected/append-9.6.out
+++ b/test/expected/append-9.6.out
@@ -113,7 +113,11 @@ SELECT create_hypertable('metrics_space','time','device_id',3);
  (6,public,metrics_space,t)
 (1 row)
 
-INSERT INTO metrics_space SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id FROM generate_series('2000-01-01'::date, '2000-01-14'::date, '5m'::interval) g1(time), generate_series(1,10,1) g2(device_id);
+INSERT INTO metrics_space
+SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id
+FROM generate_series('2000-01-01'::timestamptz, '2000-01-14'::timestamptz, '5m'::interval) g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 ANALYZE metrics_space;
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Apache License 2.0.
@@ -1820,7 +1824,11 @@ psql:include/append_query.sql:315: NOTICE:  adding not-null constraint to column
 (1 row)
 
 CREATE INDEX ON join_limit(time,device_id);
-INSERT INTO join_limit SELECT time, device_id FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time), generate_series(1,10,1) g2(device_id);
+INSERT INTO join_limit
+SELECT time, device_id
+FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 -- get 2nd chunk oid
 SELECT tableoid AS "CHUNK_OID" FROM join_limit WHERE time > '2000-01-07' ORDER BY time LIMIT 1
 \gset
diff --git a/test/sql/include/append_load.sql b/test/sql/include/append_load.sql
index 124ca034b..25442bd43 100644
--- a/test/sql/include/append_load.sql
+++ b/test/sql/include/append_load.sql
@@ -73,6 +73,12 @@ ANALYZE metrics_timestamptz;
 -- create space partitioned hypertable
 CREATE TABLE metrics_space(time timestamptz NOT NULL, device_id int NOT NULL, v1 float, v2 float, v3 text);
 SELECT create_hypertable('metrics_space','time','device_id',3);
-INSERT INTO metrics_space SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id FROM generate_series('2000-01-01'::date, '2000-01-14'::date, '5m'::interval) g1(time), generate_series(1,10,1) g2(device_id);
+
+INSERT INTO metrics_space
+SELECT time, device_id, device_id + 0.25, device_id + 0.75, device_id
+FROM generate_series('2000-01-01'::timestamptz, '2000-01-14'::timestamptz, '5m'::interval) g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
+
 ANALYZE metrics_space;
 
diff --git a/test/sql/include/append_query.sql b/test/sql/include/append_query.sql
index 59c642feb..42e4b39d9 100644
--- a/test/sql/include/append_query.sql
+++ b/test/sql/include/append_query.sql
@@ -314,7 +314,12 @@ RESET enable_hashagg;
 CREATE TABLE join_limit (time timestamptz, device_id int);
 SELECT table_name FROM create_hypertable('join_limit','time',create_default_indexes:=false);
 CREATE INDEX ON join_limit(time,device_id);
-INSERT INTO join_limit SELECT time, device_id FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time), generate_series(1,10,1) g2(device_id);
+
+INSERT INTO join_limit
+SELECT time, device_id
+FROM generate_series('2000-01-01'::timestamptz,'2000-01-21','30m') g1(time),
+  generate_series(1,10,1) g2(device_id)
+ORDER BY time, device_id;
 
 -- get 2nd chunk oid
 SELECT tableoid AS "CHUNK_OID" FROM join_limit WHERE time > '2000-01-07' ORDER BY time LIMIT 1