4 files changed, 18 insertions, 39 deletions
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 c4481c54f41..6adc5d9ef6d 100644
--- a/src/test/regress/expected/horology-no-DST-before-1970.out
+++ b/src/test/regress/expected/horology-no-DST-before-1970.out
@@ -119,12 +119,6 @@ SELECT CAST(time with time zone '01:02-08' AS interval) AS "+00:01";
 ERROR:  Cannot cast type 'timetz' to 'interval'
 SELECT CAST(interval '02:03' AS time with time zone) AS "02:03:00-08";
 ERROR:  Cannot cast type 'interval' to 'timetz'
-SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
- 03:31:00-08 
--------------
- 03:31:00-08
-(1 row)
-
 SELECT time with time zone '01:30-08' - interval '02:01' AS "23:29:00-08";
  23:29:00-08 
 -------------
@@ -137,12 +131,10 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
  14:31:00-08
 (1 row)
 
-SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
- 07:31:00-08 
--------------
- 07:31:00-08
-(1 row)
-
+-- These two tests cannot be used because they default to current timezone,
+-- which may be either -08 or -07 depending on the time of year.
+-- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
+-- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
 ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
 	You will have to retype this query using an explicit cast
diff --git a/src/test/regress/expected/horology-solaris-1947.out b/src/test/regress/expected/horology-solaris-1947.out
index c77dea0b030..dad40d14956 100644
--- a/src/test/regress/expected/horology-solaris-1947.out
+++ b/src/test/regress/expected/horology-solaris-1947.out
@@ -119,12 +119,6 @@ SELECT CAST(time with time zone '01:02-08' AS interval) AS "+00:01";
 ERROR:  Cannot cast type 'timetz' to 'interval'
 SELECT CAST(interval '02:03' AS time with time zone) AS "02:03:00-08";
 ERROR:  Cannot cast type 'interval' to 'timetz'
-SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
- 03:31:00-08 
--------------
- 03:31:00-08
-(1 row)
-
 SELECT time with time zone '01:30-08' - interval '02:01' AS "23:29:00-08";
  23:29:00-08 
 -------------
@@ -137,12 +131,10 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
  14:31:00-08
 (1 row)
 
-SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
- 07:31:00-08 
--------------
- 07:31:00-08
-(1 row)
-
+-- These two tests cannot be used because they default to current timezone,
+-- which may be either -08 or -07 depending on the time of year.
+-- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
+-- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
 ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
 	You will have to retype this query using an explicit cast
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 2f970db430f..0e39d5e9535 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -119,12 +119,6 @@ SELECT CAST(time with time zone '01:02-08' AS interval) AS "+00:01";
 ERROR:  Cannot cast type 'timetz' to 'interval'
 SELECT CAST(interval '02:03' AS time with time zone) AS "02:03:00-08";
 ERROR:  Cannot cast type 'interval' to 'timetz'
-SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
- 03:31:00-08 
--------------
- 03:31:00-08
-(1 row)
-
 SELECT time with time zone '01:30-08' - interval '02:01' AS "23:29:00-08";
  23:29:00-08 
 -------------
@@ -137,12 +131,10 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
  14:31:00-08
 (1 row)
 
-SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
- 07:31:00-08 
--------------
- 07:31:00-08
-(1 row)
-
+-- These two tests cannot be used because they default to current timezone,
+-- which may be either -08 or -07 depending on the time of year.
+-- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
+-- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
 ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
 	You will have to retype this query using an explicit cast
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index cb128433814..0ad1d9cd300 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -54,13 +54,16 @@ SELECT CAST(time with time zone '01:02-08' AS interval) AS "+00:01";
 
 SELECT CAST(interval '02:03' AS time with time zone) AS "02:03:00-08";
 
-SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
-
 SELECT time with time zone '01:30-08' - interval '02:01' AS "23:29:00-08";
 
 SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
 
-SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
+-- These two tests cannot be used because they default to current timezone,
+-- which may be either -08 or -07 depending on the time of year.
+
+-- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
+
+-- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
 
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";