diff --git a/src/test/regress/expected/horology-no-DST-before-1970.out b/src/test/regress/expected/horology-no-DST-before-1970.out
index cdf251aaecfc3251e43c98d7f46125e9715af1f8..e7bb678127186403d825806c932a82517be35a8b 100644
--- a/src/test/regress/expected/horology-no-DST-before-1970.out
+++ b/src/test/regress/expected/horology-no-DST-before-1970.out
@@ -548,11 +548,11 @@ SELECT CAST(CAST(date 'today' + time with time zone '01:30'
03:31:00
(1 row)
-SELECT CAST(CAST(date 'today' + time with time zone '03:30'
- + interval '1 month 04:01' AS time with time zone) AS time) AS "07:31:00";
+SELECT CAST(cast(date 'today' + time with time zone '03:30-08'
+ + interval '1 month 04:01' as timestamp without time zone) AS time) AS "07:31:00";
07:31:00
----------
- 06:31:00
+ 07:31:00
(1 row)
SELECT interval '04:30' - time with time zone '01:02-05' AS "20:32:00-05";
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 84251393e696c1019dfaf894d5cc00749147413f..3ac0b29b7a9aa952695c8949501b18041c54c9c8 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -548,8 +548,8 @@ SELECT CAST(CAST(date 'today' + time with time zone '01:30'
03:31:00
(1 row)
-SELECT CAST(CAST(date 'today' + time with time zone '03:30'
- + interval '1 month 04:01' AS time with time zone) AS time) AS "07:31:00";
+SELECT CAST(cast(date 'today' + time with time zone '03:30-08'
+ + interval '1 month 04:01' as timestamp without time zone) AS time) AS "07:31:00";
07:31:00
----------
07:31:00
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index eb4c05e7421532cd558c99b1c27b38a7f4dc8974..7c87bf560e0a0bd10d26cada66c497901d222193 100644
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -1308,8 +1308,8 @@ SELECT viewname, definition FROM pg_views ORDER BY viewname;
SELECT tablename, rulename, definition FROM pg_rules
ORDER BY tablename, rulename;
- tablename | rulename | definition
----------------+-----------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ tablename | rulename | definition
+---------------+-----------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
rtest_emp | rtest_emp_del | CREATE RULE rtest_emp_del AS ON DELETE TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (old.ename, "current_user"(), 'fired '::bpchar, '$0.00'::money, old.salary);
rtest_emp | rtest_emp_ins | CREATE RULE rtest_emp_ins AS ON INSERT TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (new.ename, "current_user"(), 'hired '::bpchar, new.salary, '$0.00'::money);
rtest_emp | rtest_emp_upd | CREATE RULE rtest_emp_upd AS ON UPDATE TO rtest_emp WHERE (new.salary <> old.salary) DO INSERT INTO rtest_emplog (ename, who, "action", newsal, oldsal) VALUES (new.ename, "current_user"(), 'honored '::bpchar, new.salary, old.salary);
@@ -1335,7 +1335,7 @@ SELECT tablename, rulename, definition FROM pg_rules
shoelace | shoelace_del | CREATE RULE shoelace_del AS ON DELETE TO shoelace DO INSTEAD DELETE FROM shoelace_data WHERE (shoelace_data.sl_name = old.sl_name);
shoelace | shoelace_ins | CREATE RULE shoelace_ins AS ON INSERT TO shoelace DO INSTEAD INSERT INTO shoelace_data (sl_name, sl_avail, sl_color, sl_len, sl_unit) VALUES (new.sl_name, new.sl_avail, new.sl_color, new.sl_len, new.sl_unit);
shoelace | shoelace_upd | CREATE RULE shoelace_upd AS ON UPDATE TO shoelace DO INSTEAD UPDATE shoelace_data SET sl_name = new.sl_name, sl_avail = new.sl_avail, sl_color = new.sl_color, sl_len = new.sl_len, sl_unit = new.sl_unit WHERE (shoelace_data.sl_name = old.sl_name);
- shoelace_data | log_shoelace | CREATE RULE log_shoelace AS ON UPDATE TO shoelace_data WHERE (new.sl_avail <> old.sl_avail) DO INSERT INTO shoelace_log (sl_name, sl_avail, log_who, log_when) VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name, 'Thu Jan 01 00:00:00 1970'::"timestamp");
+ shoelace_data | log_shoelace | CREATE RULE log_shoelace AS ON UPDATE TO shoelace_data WHERE (new.sl_avail <> old.sl_avail) DO INSERT INTO shoelace_log (sl_name, sl_avail, log_who, log_when) VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name, "timestamp"('epoch'::text));
shoelace_ok | shoelace_ok_ins | CREATE RULE shoelace_ok_ins AS ON INSERT TO shoelace_ok DO INSTEAD UPDATE shoelace SET sl_avail = (shoelace.sl_avail + new.ok_quant) WHERE (shoelace.sl_name = new.ok_name);
(27 rows)
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index 96027a909c15b307dcbe1050bfc47e21c711b2ee..396ee775da0a17d0686b717fc0073244f17afeea 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -87,8 +87,8 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
SELECT CAST(CAST(date 'today' + time with time zone '01:30'
+ interval '02:01' AS time with time zone) AS time) AS "03:31:00";
-SELECT CAST(CAST(date 'today' + time with time zone '03:30'
- + interval '1 month 04:01' AS time with time zone) AS time) AS "07:31:00";
+SELECT CAST(cast(date 'today' + time with time zone '03:30-08'
+ + interval '1 month 04:01' as timestamp without time zone) AS time) AS "07:31:00";
SELECT interval '04:30' - time with time zone '01:02-05' AS "20:32:00-05";