From e6979835246e6011eacbde6d0755e73d6f0cf5ca Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:05:20 +0100
Subject: [PATCH] Use America/Los_Angeles in tests instead of PST8PDT

Follow the PG upstream changes in light of the upcoming timezone
updates. This should fix our regression tests on latest PG snapshots.

https://github.com/postgres/postgres/commit/2b94ee58bf256e1b4682f21f13d0f2c73e1b0cc2
---
 tsl/test/expected/cagg_watermark.out               | 6 +++---
 tsl/test/expected/chunk_merge.out                  | 2 +-
 tsl/test/expected/compression.out                  | 4 ++--
 tsl/test/expected/compression_bgw.out              | 4 ++--
 tsl/test/expected/compression_ddl.out              | 4 ++--
 tsl/test/expected/compression_insert.out           | 2 +-
 tsl/test/expected/continuous_aggs-15.out           | 2 +-
 tsl/test/expected/feature_flags.out                | 2 +-
 tsl/test/expected/information_view_chunk_count.out | 2 +-
 tsl/test/expected/size_utils_tsl.out               | 2 +-
 tsl/test/expected/telemetry_stats.out              | 2 +-
 tsl/test/expected/transparent_decompression-15.out | 4 ++--
 tsl/test/sql/cagg_watermark.sql                    | 6 +++---
 tsl/test/sql/chunk_merge.sql                       | 2 +-
 tsl/test/sql/compression.sql                       | 4 ++--
 tsl/test/sql/compression_bgw.sql                   | 4 ++--
 tsl/test/sql/compression_ddl.sql                   | 4 ++--
 tsl/test/sql/compression_insert.sql                | 2 +-
 tsl/test/sql/continuous_aggs.sql.in                | 2 +-
 tsl/test/sql/feature_flags.sql                     | 2 +-
 tsl/test/sql/information_view_chunk_count.sql      | 2 +-
 tsl/test/sql/jit.sql                               | 2 +-
 tsl/test/sql/size_utils_tsl.sql                    | 2 +-
 tsl/test/sql/telemetry_stats.sql                   | 2 +-
 tsl/test/sql/transparent_decompression.sql.in      | 4 ++--
 25 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/tsl/test/expected/cagg_watermark.out b/tsl/test/expected/cagg_watermark.out
index 7ec8ac306c6..16b6f76166a 100644
--- a/tsl/test/expected/cagg_watermark.out
+++ b/tsl/test/expected/cagg_watermark.out
@@ -1,7 +1,7 @@
 -- This file and its contents are licensed under the Timescale License.
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 \set EXPLAIN_ANALYZE 'EXPLAIN (analyze,costs off,timing off,summary off)'
 CREATE TABLE continuous_agg_test(time int, data int);
 SELECT create_hypertable('continuous_agg_test', 'time', chunk_time_interval=> 10);
@@ -75,7 +75,7 @@ SELECT * from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log;
 \c :TEST_DBNAME :ROLE_SUPERUSER
 INSERT INTO _timescaledb_catalog.continuous_aggs_invalidation_threshold VALUES (1, 15);
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 INSERT INTO continuous_agg_test VALUES (10, 1), (11, 2), (21, 3), (22, 4);
 SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold;
  hypertable_id | watermark 
@@ -349,7 +349,7 @@ UPDATE _timescaledb_catalog.continuous_aggs_invalidation_threshold
 SET watermark = 2
 WHERE hypertable_id = 5;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 INSERT INTO ts_continuous_test VALUES (1, 1);
 SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold;
  hypertable_id | watermark 
diff --git a/tsl/test/expected/chunk_merge.out b/tsl/test/expected/chunk_merge.out
index b5de894ac33..244b4e0089d 100644
--- a/tsl/test/expected/chunk_merge.out
+++ b/tsl/test/expected/chunk_merge.out
@@ -6,7 +6,7 @@ CREATE OR REPLACE FUNCTION _timescaledb_internal.test_merge_chunks_on_dimension(
  RETURNS VOID
     AS :TSL_MODULE_PATHNAME, 'ts_test_merge_chunks_on_dimension' LANGUAGE C VOLATILE;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CREATE TABLE test1 ("Time" timestamptz, i integer, value integer);
 SELECT table_name FROM Create_hypertable('test1', 'Time', chunk_time_interval=> INTERVAL '1 hour');
 NOTICE:  adding not-null constraint to column "Time"
diff --git a/tsl/test/expected/compression.out b/tsl/test/expected/compression.out
index 826c4f31946..5e186d55014 100644
--- a/tsl/test/expected/compression.out
+++ b/tsl/test/expected/compression.out
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 SET timescaledb.enable_transparent_decompression to OFF;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 \set PREFIX 'EXPLAIN (analyze, verbose, costs off, timing off, summary off)'
 \ir include/rand_generator.sql
 -- This file and its contents are licensed under the Timescale License.
@@ -1498,7 +1498,7 @@ SET reltuples = 0, relpages = 0
   WHERE ht.table_name = 'stattest2' AND ch.hypertable_id = ht.id
         AND ch.compressed_chunk_id > 0 );
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 -- reltuples is initially -1 on PG14 before VACUUM/ANALYZE has been run
 SELECT relname, CASE WHEN reltuples > 0 THEN reltuples ELSE 0 END AS reltuples, relpages, relallvisible FROM pg_class
  WHERE relname in ( SELECT ch.table_name FROM
diff --git a/tsl/test/expected/compression_bgw.out b/tsl/test/expected/compression_bgw.out
index 3ea18c6e897..fddf7b28022 100644
--- a/tsl/test/expected/compression_bgw.out
+++ b/tsl/test/expected/compression_bgw.out
@@ -7,7 +7,7 @@ CREATE ROLE NOLOGIN_ROLE WITH nologin noinherit;
 GRANT CREATE ON SCHEMA public TO NOLOGIN_ROLE;
 GRANT NOLOGIN_ROLE TO :ROLE_DEFAULT_PERM_USER WITH ADMIN OPTION;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CREATE TABLE conditions (
       time        TIMESTAMPTZ       NOT NULL,
       location    TEXT              NOT NULL,
@@ -287,7 +287,7 @@ ERROR:  permission denied to start background process as role "nologin_role"
 DROP TABLE test_table_nologin;
 RESET ROLE;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CREATE TABLE conditions(
     time TIMESTAMPTZ NOT NULL,
     device INTEGER,
diff --git a/tsl/test/expected/compression_ddl.out b/tsl/test/expected/compression_ddl.out
index 25b28a10379..3a6d2c63c66 100644
--- a/tsl/test/expected/compression_ddl.out
+++ b/tsl/test/expected/compression_ddl.out
@@ -30,7 +30,7 @@ SET client_min_messages = NOTICE;
 CREATE TABLESPACE tablespace1 OWNER :ROLE_DEFAULT_PERM_USER LOCATION :TEST_TABLESPACE1_PATH;
 CREATE TABLESPACE tablespace2 OWNER :ROLE_DEFAULT_PERM_USER LOCATION :TEST_TABLESPACE2_PATH;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CREATE TABLE test1 ("Time" timestamptz, i integer, b bigint, t text);
 SELECT table_name from create_hypertable('test1', 'Time', chunk_time_interval=> INTERVAL '1 day');
 NOTICE:  adding not-null constraint to column "Time"
@@ -563,7 +563,7 @@ SELECT count(*) FROM test1_cont_view;
 (1 row)
 
 \c :TEST_DBNAME :ROLE_SUPERUSER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 SELECT chunk.schema_name|| '.' || chunk.table_name as "COMPRESSED_CHUNK_NAME"
 FROM _timescaledb_catalog.chunk chunk
 INNER JOIN _timescaledb_catalog.hypertable comp_hyper ON (chunk.hypertable_id = comp_hyper.id)
diff --git a/tsl/test/expected/compression_insert.out b/tsl/test/expected/compression_insert.out
index b3ac081a339..12da960379e 100644
--- a/tsl/test/expected/compression_insert.out
+++ b/tsl/test/expected/compression_insert.out
@@ -1,7 +1,7 @@
 -- This file and its contents are licensed under the Timescale License.
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 \set PREFIX 'EXPLAIN (costs off, summary off, timing off) '
 \set ANALYZE  'EXPLAIN (analyze, costs off, summary off, timing off) '
 CREATE TABLE test1 (timec timestamptz , i integer ,
diff --git a/tsl/test/expected/continuous_aggs-15.out b/tsl/test/expected/continuous_aggs-15.out
index 50d37d728be..aa419a08e9c 100644
--- a/tsl/test/expected/continuous_aggs-15.out
+++ b/tsl/test/expected/continuous_aggs-15.out
@@ -755,7 +755,7 @@ INNER JOIN _timescaledb_catalog.hypertable h ON(h.id = ca.mat_hypertable_id)
 WHERE user_view_name = 'mat_drop_test'
 \gset
 SET client_min_messages TO NOTICE;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CALL refresh_continuous_aggregate('mat_drop_test', NULL, NULL);
 --force invalidation
 insert into conditions
diff --git a/tsl/test/expected/feature_flags.out b/tsl/test/expected/feature_flags.out
index 07e276a4911..cc3fb0d0389 100644
--- a/tsl/test/expected/feature_flags.out
+++ b/tsl/test/expected/feature_flags.out
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 \c :TEST_DBNAME :ROLE_SUPERUSER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 -- hypertable creation
 SHOW timescaledb.enable_hypertable_create;
  timescaledb.enable_hypertable_create 
diff --git a/tsl/test/expected/information_view_chunk_count.out b/tsl/test/expected/information_view_chunk_count.out
index d6144b4c62f..280e83dad1c 100644
--- a/tsl/test/expected/information_view_chunk_count.out
+++ b/tsl/test/expected/information_view_chunk_count.out
@@ -1,7 +1,7 @@
 -- This file and its contents are licensed under the Timescale License.
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CREATE TABLE sensor_data(
 time timestamptz not null,
 sensor_id integer not null,
diff --git a/tsl/test/expected/size_utils_tsl.out b/tsl/test/expected/size_utils_tsl.out
index ada77dcdf1a..d228d9d61eb 100644
--- a/tsl/test/expected/size_utils_tsl.out
+++ b/tsl/test/expected/size_utils_tsl.out
@@ -1,7 +1,7 @@
 -- This file and its contents are licensed under the Timescale License.
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 -- Prepare test data for continuous aggregate size function tests
 CREATE TABLE hypersize(time timestamptz, device int);
 SELECT * FROM create_hypertable('hypersize', 'time');
diff --git a/tsl/test/expected/telemetry_stats.out b/tsl/test/expected/telemetry_stats.out
index c95e235c359..5ad9ac55903 100644
--- a/tsl/test/expected/telemetry_stats.out
+++ b/tsl/test/expected/telemetry_stats.out
@@ -3,7 +3,7 @@
 -- LICENSE-TIMESCALE for a copy of the license.
 --telemetry tests that require a community license
 \c :TEST_DBNAME :ROLE_CLUSTER_SUPERUSER;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 -- function call info size is too variable for this test, so disable it
 SET timescaledb.telemetry_level='no_functions';
 SELECT setseed(1);
diff --git a/tsl/test/expected/transparent_decompression-15.out b/tsl/test/expected/transparent_decompression-15.out
index 8deee3b0a4e..65ecd4bba38 100644
--- a/tsl/test/expected/transparent_decompression-15.out
+++ b/tsl/test/expected/transparent_decompression-15.out
@@ -9,7 +9,7 @@ SELECT format('include/%s_load.sql', :'TEST_BASE_NAME') AS "TEST_LOAD_NAME",
 SELECT format('\! diff %s %s', :'TEST_RESULTS_UNCOMPRESSED', :'TEST_RESULTS_COMPRESSED') AS "DIFF_CMD" \gset
 SET work_mem TO '50MB';
 SET enable_incremental_sort TO off;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 -- disable memoize node to avoid flaky results
 SET enable_memoize TO 'off';
 CREATE TABLE metrics (
@@ -171,7 +171,7 @@ FROM _timescaledb_catalog.hypertable ht
 -- no standard way to create an index on a compressed table.
 -- Once a standard way exists, modify this test to use that method.
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 CREATE INDEX ON metrics_space (device_id, device_id_peer, v0, v1 DESC, time);
 CREATE INDEX ON metrics_space (device_id, device_id_peer DESC, v0, v1 DESC, time);
 CREATE INDEX ON metrics_space (device_id DESC, device_id_peer DESC, v0, v1 DESC, time);
diff --git a/tsl/test/sql/cagg_watermark.sql b/tsl/test/sql/cagg_watermark.sql
index 3eb5069eceb..e278ad6bcb0 100644
--- a/tsl/test/sql/cagg_watermark.sql
+++ b/tsl/test/sql/cagg_watermark.sql
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 \set EXPLAIN_ANALYZE 'EXPLAIN (analyze,costs off,timing off,summary off)'
 
@@ -46,7 +46,7 @@ SELECT * from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log;
 INSERT INTO _timescaledb_catalog.continuous_aggs_invalidation_threshold VALUES (1, 15);
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 INSERT INTO continuous_agg_test VALUES (10, 1), (11, 2), (21, 3), (22, 4);
 
@@ -187,7 +187,7 @@ SET watermark = 2
 WHERE hypertable_id = 5;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 INSERT INTO ts_continuous_test VALUES (1, 1);
 
diff --git a/tsl/test/sql/chunk_merge.sql b/tsl/test/sql/chunk_merge.sql
index a54fbf47a8f..2529d32a3bc 100644
--- a/tsl/test/sql/chunk_merge.sql
+++ b/tsl/test/sql/chunk_merge.sql
@@ -8,7 +8,7 @@ CREATE OR REPLACE FUNCTION _timescaledb_internal.test_merge_chunks_on_dimension(
     AS :TSL_MODULE_PATHNAME, 'ts_test_merge_chunks_on_dimension' LANGUAGE C VOLATILE;
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CREATE TABLE test1 ("Time" timestamptz, i integer, value integer);
 SELECT table_name FROM Create_hypertable('test1', 'Time', chunk_time_interval=> INTERVAL '1 hour');
diff --git a/tsl/test/sql/compression.sql b/tsl/test/sql/compression.sql
index 7a6031a17fb..f12519f0e7b 100644
--- a/tsl/test/sql/compression.sql
+++ b/tsl/test/sql/compression.sql
@@ -3,7 +3,7 @@
 -- LICENSE-TIMESCALE for a copy of the license.
 
 SET timescaledb.enable_transparent_decompression to OFF;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 \set PREFIX 'EXPLAIN (analyze, verbose, costs off, timing off, summary off)'
 
@@ -631,7 +631,7 @@ SET reltuples = 0, relpages = 0
         AND ch.compressed_chunk_id > 0 );
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 -- reltuples is initially -1 on PG14 before VACUUM/ANALYZE has been run
 SELECT relname, CASE WHEN reltuples > 0 THEN reltuples ELSE 0 END AS reltuples, relpages, relallvisible FROM pg_class
diff --git a/tsl/test/sql/compression_bgw.sql b/tsl/test/sql/compression_bgw.sql
index 1af3cdbca39..f903b87e05b 100644
--- a/tsl/test/sql/compression_bgw.sql
+++ b/tsl/test/sql/compression_bgw.sql
@@ -11,7 +11,7 @@ GRANT NOLOGIN_ROLE TO :ROLE_DEFAULT_PERM_USER WITH ADMIN OPTION;
 
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CREATE TABLE conditions (
       time        TIMESTAMPTZ       NOT NULL,
@@ -166,7 +166,7 @@ RESET ROLE;
 
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CREATE TABLE conditions(
     time TIMESTAMPTZ NOT NULL,
diff --git a/tsl/test/sql/compression_ddl.sql b/tsl/test/sql/compression_ddl.sql
index 581f64e15bd..af872977be5 100644
--- a/tsl/test/sql/compression_ddl.sql
+++ b/tsl/test/sql/compression_ddl.sql
@@ -15,7 +15,7 @@ CREATE TABLESPACE tablespace2 OWNER :ROLE_DEFAULT_PERM_USER LOCATION :TEST_TABLE
 
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CREATE TABLE test1 ("Time" timestamptz, i integer, b bigint, t text);
 SELECT table_name from create_hypertable('test1', 'Time', chunk_time_interval=> INTERVAL '1 day');
@@ -358,7 +358,7 @@ SELECT count(*) FROM test1_cont_view;
 
 \c :TEST_DBNAME :ROLE_SUPERUSER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 SELECT chunk.schema_name|| '.' || chunk.table_name as "COMPRESSED_CHUNK_NAME"
 FROM _timescaledb_catalog.chunk chunk
diff --git a/tsl/test/sql/compression_insert.sql b/tsl/test/sql/compression_insert.sql
index a3925aeb5b0..ab8e05847f1 100644
--- a/tsl/test/sql/compression_insert.sql
+++ b/tsl/test/sql/compression_insert.sql
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 \set PREFIX 'EXPLAIN (costs off, summary off, timing off) '
 \set ANALYZE  'EXPLAIN (analyze, costs off, summary off, timing off) '
diff --git a/tsl/test/sql/continuous_aggs.sql.in b/tsl/test/sql/continuous_aggs.sql.in
index efb8ead9176..cb5f173adff 100644
--- a/tsl/test/sql/continuous_aggs.sql.in
+++ b/tsl/test/sql/continuous_aggs.sql.in
@@ -606,7 +606,7 @@ WHERE user_view_name = 'mat_drop_test'
 \gset
 
 SET client_min_messages TO NOTICE;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CALL refresh_continuous_aggregate('mat_drop_test', NULL, NULL);
 
diff --git a/tsl/test/sql/feature_flags.sql b/tsl/test/sql/feature_flags.sql
index b3e96c8288e..211d7b72e61 100644
--- a/tsl/test/sql/feature_flags.sql
+++ b/tsl/test/sql/feature_flags.sql
@@ -4,7 +4,7 @@
 
 \c :TEST_DBNAME :ROLE_SUPERUSER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 -- hypertable creation
 SHOW timescaledb.enable_hypertable_create;
diff --git a/tsl/test/sql/information_view_chunk_count.sql b/tsl/test/sql/information_view_chunk_count.sql
index 3eb9a86ff84..85cbd27cc0c 100644
--- a/tsl/test/sql/information_view_chunk_count.sql
+++ b/tsl/test/sql/information_view_chunk_count.sql
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CREATE TABLE sensor_data(
 time timestamptz not null,
diff --git a/tsl/test/sql/jit.sql b/tsl/test/sql/jit.sql
index d2daa3897e2..4f6ade3a9c0 100644
--- a/tsl/test/sql/jit.sql
+++ b/tsl/test/sql/jit.sql
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 \set TEST_BASE_NAME jit
 SELECT format('include/%s_load.sql', :'TEST_BASE_NAME') as "TEST_LOAD_NAME",
diff --git a/tsl/test/sql/size_utils_tsl.sql b/tsl/test/sql/size_utils_tsl.sql
index bd6d52b94fb..0db56ab6951 100644
--- a/tsl/test/sql/size_utils_tsl.sql
+++ b/tsl/test/sql/size_utils_tsl.sql
@@ -2,7 +2,7 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-TIMESCALE for a copy of the license.
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 -- Prepare test data for continuous aggregate size function tests
 CREATE TABLE hypersize(time timestamptz, device int);
diff --git a/tsl/test/sql/telemetry_stats.sql b/tsl/test/sql/telemetry_stats.sql
index a1a2b8d8159..f1224f40e78 100644
--- a/tsl/test/sql/telemetry_stats.sql
+++ b/tsl/test/sql/telemetry_stats.sql
@@ -5,7 +5,7 @@
 --telemetry tests that require a community license
 \c :TEST_DBNAME :ROLE_CLUSTER_SUPERUSER;
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 -- function call info size is too variable for this test, so disable it
 SET timescaledb.telemetry_level='no_functions';
diff --git a/tsl/test/sql/transparent_decompression.sql.in b/tsl/test/sql/transparent_decompression.sql.in
index 96cd9325821..b45492162f1 100644
--- a/tsl/test/sql/transparent_decompression.sql.in
+++ b/tsl/test/sql/transparent_decompression.sql.in
@@ -12,7 +12,7 @@ SELECT format('\! diff %s %s', :'TEST_RESULTS_UNCOMPRESSED', :'TEST_RESULTS_COMP
 
 SET work_mem TO '50MB';
 SET enable_incremental_sort TO off;
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 -- disable memoize node to avoid flaky results
 SET enable_memoize TO 'off';
@@ -191,7 +191,7 @@ FROM _timescaledb_catalog.hypertable ht
 
 \c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 
-SET timezone TO PST8PDT;
+SET timezone TO 'America/Los_Angeles';
 
 CREATE INDEX ON metrics_space (device_id, device_id_peer, v0, v1 DESC, time);