diff --git a/test/expected/create_hypertable.out b/test/expected/create_hypertable.out
index 2720904c7..dd09aae34 100644
--- a/test/expected/create_hypertable.out
+++ b/test/expected/create_hypertable.out
@@ -2,8 +2,7 @@
 \set VERBOSITY verbose
 \set SHOW_CONTEXT never
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/ddl.out b/test/expected/ddl.out
index ee2e951d0..212d0877b 100644
--- a/test/expected/ddl.out
+++ b/test/expected/ddl.out
@@ -3,8 +3,7 @@
 \set SHOW_CONTEXT never
 \o /dev/null
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/ddl_errors.out b/test/expected/ddl_errors.out
index b6b7412b5..49f4d2db5 100644
--- a/test/expected/ddl_errors.out
+++ b/test/expected/ddl_errors.out
@@ -3,8 +3,7 @@
 \set SHOW_CONTEXT never
 \o /dev/null
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/ddl_single.out b/test/expected/ddl_single.out
index 472868c9b..9c4c91f79 100644
--- a/test/expected/ddl_single.out
+++ b/test/expected/ddl_single.out
@@ -3,8 +3,7 @@
 \set SHOW_CONTEXT never
 \o /dev/null
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/delete.out b/test/expected/delete.out
index fdebf778a..5b7a32b8e 100644
--- a/test/expected/delete.out
+++ b/test/expected/delete.out
@@ -3,8 +3,7 @@
 \ir include/insert_two_partitions.sql
 \set ON_ERROR_STOP 1
 \ir create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/drop_chunks.out b/test/expected/drop_chunks.out
index 538ada2b9..8dfe3d8c4 100644
--- a/test/expected/drop_chunks.out
+++ b/test/expected/drop_chunks.out
@@ -3,8 +3,7 @@
 \set SHOW_CONTEXT never
 \o /dev/null
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/insert.out b/test/expected/insert.out
index 5135fe72f..36a248a7f 100644
--- a/test/expected/insert.out
+++ b/test/expected/insert.out
@@ -3,8 +3,7 @@
 \ir include/insert_two_partitions.sql
 \set ON_ERROR_STOP 1
 \ir create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/insert_single.out b/test/expected/insert_single.out
index 89d5afdb3..bd2e42452 100644
--- a/test/expected/insert_single.out
+++ b/test/expected/insert_single.out
@@ -3,8 +3,7 @@
 \ir include/insert_single.sql
 \set ON_ERROR_STOP 1
 \ir create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/pg_dump.out b/test/expected/pg_dump.out
index 485fbb394..38ac75cc8 100644
--- a/test/expected/pg_dump.out
+++ b/test/expected/pg_dump.out
@@ -5,8 +5,7 @@
 \ir include/insert_two_partitions.sql
 \set ON_ERROR_STOP 1
 \ir create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/sql_query.out b/test/expected/sql_query.out
index b6fa88000..b0eccdd65 100644
--- a/test/expected/sql_query.out
+++ b/test/expected/sql_query.out
@@ -3,8 +3,7 @@
 \ir include/insert_single.sql
 \set ON_ERROR_STOP 1
 \ir create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/expected/tablespace.out b/test/expected/tablespace.out
index c653558ea..62b4bb50e 100644
--- a/test/expected/tablespace.out
+++ b/test/expected/tablespace.out
@@ -1,8 +1,7 @@
 \set ON_ERROR_STOP 1
 \set SHOW_CONTEXT never
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
@@ -93,8 +92,7 @@ Child tables: _copy_temp_1,
               _iobeamdb_internal._hyper_1_0_replica
 
 --cleanup
-\set VERBOSITY normal
-unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 drop table test_tspace;
 NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to table _iobeamdb_internal._hyper_1_0_replica
diff --git a/test/expected/timestamp.out b/test/expected/timestamp.out
index 2eaa2e89a..3dd496170 100644
--- a/test/expected/timestamp.out
+++ b/test/expected/timestamp.out
@@ -1,8 +1,7 @@
 \set ON_ERROR_STOP 1
 \o /dev/null
 \ir include/create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
@@ -232,8 +231,7 @@ SELECT _iobeamdb_internal.to_timestamp(-210866803200000000);
  Mon Nov 24 00:00:00 4714 UTC BC
 (1 row)
 
-\set VERBOSITY normal
-unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 -- Going beyond Julian day zero should give out-of-range error
 SELECT _iobeamdb_internal.to_timestamp(-210866803200000001);
 ERROR:  timestamp out of range
diff --git a/test/expected/update.out b/test/expected/update.out
index 032ff361f..67e33490f 100644
--- a/test/expected/update.out
+++ b/test/expected/update.out
@@ -3,8 +3,7 @@
 \ir include/insert_single.sql
 \set ON_ERROR_STOP 1
 \ir create_single_db.sql
-\set VERBOSITY normal
-psql:include/create_single_db.sql:1: unrecognized value "normal" for "VERBOSITY"; assuming "default"
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/sql/include/create_single_db.sql b/test/sql/include/create_single_db.sql
index 2273da490..dfcaef21f 100644
--- a/test/sql/include/create_single_db.sql
+++ b/test/sql/include/create_single_db.sql
@@ -1,4 +1,4 @@
-\set VERBOSITY normal
+\set VERBOSITY default
 SET client_min_messages = WARNING;
 DROP DATABASE IF EXISTS single;
 SET client_min_messages = NOTICE;
diff --git a/test/sql/tablespace.sql b/test/sql/tablespace.sql
index 5357f5a6b..76e40378c 100644
--- a/test/sql/tablespace.sql
+++ b/test/sql/tablespace.sql
@@ -28,6 +28,6 @@ insert into test_tspace values ('2017-01-20T09:00:02', 22.3, 'dev7');
 \d+ _iobeamdb_internal.*
 
 --cleanup
-\set VERBOSITY normal
+\set VERBOSITY default
 drop table test_tspace;
 drop tablespace tspace1;
diff --git a/test/sql/timestamp.sql b/test/sql/timestamp.sql
index b3fd47265..dcfccb460 100644
--- a/test/sql/timestamp.sql
+++ b/test/sql/timestamp.sql
@@ -128,7 +128,7 @@ SELECT _iobeamdb_internal.to_timestamp(9223372036854775807);
 -- Julian day zero is -210866803200000000 microseconds from UNIX epoch
 SELECT _iobeamdb_internal.to_timestamp(-210866803200000000);
 
-\set VERBOSITY normal
+\set VERBOSITY default
 -- Going beyond Julian day zero should give out-of-range error
 SELECT _iobeamdb_internal.to_timestamp(-210866803200000001);