diff --git a/sql/londiste/expected/init_ext.out b/sql/londiste/expected/init_ext.out
index db6ebeef..d072a5dd 100644
--- a/sql/londiste/expected/init_ext.out
+++ b/sql/londiste/expected/init_ext.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               0
diff --git a/sql/londiste/expected/init_ext_1.out b/sql/londiste/expected/init_ext_1.out
index 961da159..d5a86e84 100644
--- a/sql/londiste/expected/init_ext_1.out
+++ b/sql/londiste/expected/init_ext_1.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               2
diff --git a/sql/londiste/expected/init_noext.out b/sql/londiste/expected/init_noext.out
index 3cc747e5..3f761fb6 100644
--- a/sql/londiste/expected/init_noext.out
+++ b/sql/londiste/expected/init_noext.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               0
diff --git a/sql/londiste/expected/init_noext_1.out b/sql/londiste/expected/init_noext_1.out
index 3cc747e5..3f761fb6 100644
--- a/sql/londiste/expected/init_noext_1.out
+++ b/sql/londiste/expected/init_noext_1.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               0
diff --git a/sql/londiste/expected/londiste_install.out b/sql/londiste/expected/londiste_install.out
index 3cc747e5..3f761fb6 100644
--- a/sql/londiste/expected/londiste_install.out
+++ b/sql/londiste/expected/londiste_install.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               0
diff --git a/sql/londiste/expected/londiste_merge.out b/sql/londiste/expected/londiste_merge.out
index 67354726..b9fe9b22 100644
--- a/sql/londiste/expected/londiste_merge.out
+++ b/sql/londiste/expected/londiste_merge.out
@@ -253,7 +253,7 @@ select * from londiste.global_add_table('part3_set', 'tblmerge');
       200 | Table added: tblmerge
 (1 row)
 
-\set ECHO off
+\set ECHO none
 select * from testmatrix();
      p1s      |     p2s      |     p3s      |     p1r     |     p2r     |     p3r     
 --------------+--------------+--------------+-------------+-------------+-------------
diff --git a/sql/londiste/sql/init_ext.sql b/sql/londiste/sql/init_ext.sql
index fdae9503..d0c63e61 100644
--- a/sql/londiste/sql/init_ext.sql
+++ b/sql/londiste/sql/init_ext.sql
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
 
 set log_error_verbosity = 'terse';
 set client_min_messages = 'fatal';
diff --git a/sql/londiste/sql/init_noext.sql b/sql/londiste/sql/init_noext.sql
index c11550cf..18e3594e 100644
--- a/sql/londiste/sql/init_noext.sql
+++ b/sql/londiste/sql/init_noext.sql
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
 
 set log_error_verbosity = 'terse';
 set client_min_messages = 'fatal';
diff --git a/sql/londiste/sql/londiste_install.sql b/sql/londiste/sql/londiste_install.sql
index c11550cf..18e3594e 100644
--- a/sql/londiste/sql/londiste_install.sql
+++ b/sql/londiste/sql/londiste_install.sql
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
 
 set log_error_verbosity = 'terse';
 set client_min_messages = 'fatal';
diff --git a/sql/londiste/sql/londiste_merge.sql b/sql/londiste/sql/londiste_merge.sql
index 01d39f93..2d23755a 100644
--- a/sql/londiste/sql/londiste_merge.sql
+++ b/sql/londiste/sql/londiste_merge.sql
@@ -70,7 +70,7 @@ select * from londiste.get_table_list('combined_set');
 
 select * from londiste.global_add_table('part3_set', 'tblmerge');
 
-\set ECHO off
+\set ECHO none
 
 create table states ( state text );
 insert into states values ('in-copy');
diff --git a/sql/pgq/expected/pgq_perms.out b/sql/pgq/expected/pgq_perms.out
index 83b6ac4d..36ba767d 100644
--- a/sql/pgq/expected/pgq_perms.out
+++ b/sql/pgq/expected/pgq_perms.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
 drop role if exists pgq_test_producer;
 drop role if exists pgq_test_consumer;
 drop role if exists pgq_test_admin;
diff --git a/sql/pgq/sql/pgq_perms.sql b/sql/pgq/sql/pgq_perms.sql
index c1962a1f..0fb6fa7b 100644
--- a/sql/pgq/sql/pgq_perms.sql
+++ b/sql/pgq/sql/pgq_perms.sql
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
 \set VERBOSITY 'terse'
 set client_min_messages = 'warning';
 
diff --git a/sql/pgq_ext/expected/init_ext.out b/sql/pgq_ext/expected/init_ext.out
index 921f10b0..f4e60037 100644
--- a/sql/pgq_ext/expected/init_ext.out
+++ b/sql/pgq_ext/expected/init_ext.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               4
diff --git a/sql/pgq_ext/expected/init_noext.out b/sql/pgq_ext/expected/init_noext.out
index 48a00a35..8664b284 100644
--- a/sql/pgq_ext/expected/init_noext.out
+++ b/sql/pgq_ext/expected/init_noext.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               4
diff --git a/sql/pgq_ext/expected/test_upgrade.out b/sql/pgq_ext/expected/test_upgrade.out
index c717809a..816c831f 100644
--- a/sql/pgq_ext/expected/test_upgrade.out
+++ b/sql/pgq_ext/expected/test_upgrade.out
@@ -1,4 +1,4 @@
-\set ECHO off
+\set ECHO none
  upgrade_schema 
 ----------------
               8
diff --git a/sql/pgq_ext/sql/init_ext.sql b/sql/pgq_ext/sql/init_ext.sql
index bea94d26..8cabf0aa 100644
--- a/sql/pgq_ext/sql/init_ext.sql
+++ b/sql/pgq_ext/sql/init_ext.sql
@@ -1,5 +1,5 @@
 
-\set ECHO off
+\set ECHO none
 \i structure/install.sql
 \set ECHO all
 create extension pgq_ext from 'unpackaged';
diff --git a/sql/pgq_ext/sql/init_noext.sql b/sql/pgq_ext/sql/init_noext.sql
index 23803bd3..a82202c8 100644
--- a/sql/pgq_ext/sql/init_noext.sql
+++ b/sql/pgq_ext/sql/init_noext.sql
@@ -1,3 +1,3 @@
-\set ECHO off
+\set ECHO none
 \i structure/install.sql
 
diff --git a/sql/pgq_ext/sql/test_upgrade.sql b/sql/pgq_ext/sql/test_upgrade.sql
index 791a0325..29a78708 100644
--- a/sql/pgq_ext/sql/test_upgrade.sql
+++ b/sql/pgq_ext/sql/test_upgrade.sql
@@ -1,5 +1,5 @@
 
-\set ECHO off
+\set ECHO none
 
 set log_error_verbosity = 'terse';
 set client_min_messages = 'fatal';