diff --git a/src/tests/regress/data/expected/text.out b/src/tests/regress/data/expected/text.out
index b625b09f32d3..bdb9a894dabb 100644
--- a/src/tests/regress/data/expected/text.out
+++ b/src/tests/regress/data/expected/text.out
@@ -23,6 +23,7 @@ SELECT * FROM TEXT_TBL;
  hi de ho neighbor
 (2 rows)
 
+DROP TABLE TEXT_TBL;
 -- As of 8.3 we have removed most implicit casts to text, so that for example
 -- this no longer works:
 select length(42);
diff --git a/src/tests/regress/data/schedule b/src/tests/regress/data/schedule
index 896722cdb1af..f73d1f525e60 100644
--- a/src/tests/regress/data/schedule
+++ b/src/tests/regress/data/schedule
@@ -7,7 +7,7 @@
 # interferes with crash-recovery testing.
 # test: tablespace
 
-test: boolean varchar int2 int4 int8 float4 float8 comments
+test: boolean varchar text int2 int4 int8 float4 float8 comments
 test: date time timestamp interval
 test: case arrays
 test: jsonb
diff --git a/src/tests/regress/data/sql/text.sql b/src/tests/regress/data/sql/text.sql
index 56eee69abc63..b125b19e9be3 100644
--- a/src/tests/regress/data/sql/text.sql
+++ b/src/tests/regress/data/sql/text.sql
@@ -13,6 +13,8 @@ INSERT INTO TEXT_TBL VALUES ('hi de ho neighbor');
 
 SELECT * FROM TEXT_TBL;
 
+DROP TABLE TEXT_TBL;
+
 -- As of 8.3 we have removed most implicit casts to text, so that for example
 -- this no longer works:
 
@@ -33,86 +35,86 @@ select 3 || 4.0;
  * various string functions
  */
 select concat('one');
-select concat(1,2,3,'hello',true, false, to_date('20100309','YYYYMMDD'));
+--@ select concat(1,2,3,'hello',true, false, to_date('20100309','YYYYMMDD'));
 select concat_ws('#','one');
-select concat_ws('#',1,2,3,'hello',true, false, to_date('20100309','YYYYMMDD'));
+--@ select concat_ws('#',1,2,3,'hello',true, false, to_date('20100309','YYYYMMDD'));
 select concat_ws(',',10,20,null,30);
 select concat_ws('',10,20,null,30);
 select concat_ws(NULL,10,20,null,30) is null;
 select reverse('abcde');
-select i, left('ahoj', i), right('ahoj', i) from generate_series(-5, 5) t(i) order by i;
-select quote_literal('');
-select quote_literal('abc''');
-select quote_literal(e'\\');
+--@ select i, left('ahoj', i), right('ahoj', i) from generate_series(-5, 5) t(i) order by i;
+--@ select quote_literal('');
+--@ select quote_literal('abc''');
+--@ select quote_literal(e'\\');
 -- check variadic labeled argument
-select concat(variadic array[1,2,3]);
-select concat_ws(',', variadic array[1,2,3]);
-select concat_ws(',', variadic NULL::int[]);
-select concat(variadic NULL::int[]) is NULL;
-select concat(variadic '{}'::int[]) = '';
---should fail
-select concat_ws(',', variadic 10);
+--@ select concat(variadic array[1,2,3]);
+--@ select concat_ws(',', variadic array[1,2,3]);
+--@ select concat_ws(',', variadic NULL::int[]);
+--@ select concat(variadic NULL::int[]) is NULL;
+--@ select concat(variadic '{}'::int[]) = '';
+--@ --should fail
+--@ select concat_ws(',', variadic 10);
 
 /*
  * format
  */
-select format(NULL);
-select format('Hello');
-select format('Hello %s', 'World');
-select format('Hello %%');
-select format('Hello %%%%');
--- should fail
-select format('Hello %s %s', 'World');
-select format('Hello %s');
-select format('Hello %x', 20);
--- check literal and sql identifiers
-select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, 'Hello');
-select format('%s%s%s','Hello', NULL,'World');
-select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, NULL);
-select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', NULL, 'Hello');
--- should fail, sql identifier cannot be NULL
-select format('INSERT INTO %I VALUES(%L,%L)', NULL, 10, 'Hello');
--- check positional placeholders
-select format('%1$s %3$s', 1, 2, 3);
-select format('%1$s %12$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
--- should fail
-select format('%1$s %4$s', 1, 2, 3);
-select format('%1$s %13$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
-select format('%0$s', 'Hello');
-select format('%*0$s', 'Hello');
-select format('%1$', 1);
-select format('%1$1', 1);
--- check mix of positional and ordered placeholders
-select format('Hello %s %1$s %s', 'World', 'Hello again');
-select format('Hello %s %s, %2$s %2$s', 'World', 'Hello again');
--- check variadic labeled arguments
-select format('%s, %s', variadic array['Hello','World']);
-select format('%s, %s', variadic array[1, 2]);
-select format('%s, %s', variadic array[true, false]);
-select format('%s, %s', variadic array[true, false]::text[]);
--- check variadic with positional placeholders
-select format('%2$s, %1$s', variadic array['first', 'second']);
-select format('%2$s, %1$s', variadic array[1, 2]);
--- variadic argument can be array type NULL, but should not be referenced
-select format('Hello', variadic NULL::int[]);
--- variadic argument allows simulating more than FUNC_MAX_ARGS parameters
-select format(string_agg('%s',','), variadic array_agg(i))
-from generate_series(1,200) g(i);
--- check field widths and left, right alignment
-select format('>>%10s<<', 'Hello');
-select format('>>%10s<<', NULL);
-select format('>>%10s<<', '');
-select format('>>%-10s<<', '');
-select format('>>%-10s<<', 'Hello');
-select format('>>%-10s<<', NULL);
-select format('>>%1$10s<<', 'Hello');
-select format('>>%1$-10I<<', 'Hello');
-select format('>>%2$*1$L<<', 10, 'Hello');
-select format('>>%2$*1$L<<', 10, NULL);
-select format('>>%2$*1$L<<', -10, NULL);
-select format('>>%*s<<', 10, 'Hello');
-select format('>>%*1$s<<', 10, 'Hello');
-select format('>>%-s<<', 'Hello');
-select format('>>%10L<<', NULL);
-select format('>>%2$*1$L<<', NULL, 'Hello');
-select format('>>%2$*1$L<<', 0, 'Hello');
+--@ select format(NULL);
+--@ select format('Hello');
+--@ select format('Hello %s', 'World');
+--@ select format('Hello %%');
+--@ select format('Hello %%%%');
+--@ -- should fail
+--@ select format('Hello %s %s', 'World');
+--@ select format('Hello %s');
+--@ select format('Hello %x', 20);
+--@ -- check literal and sql identifiers
+--@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, 'Hello');
+--@ select format('%s%s%s','Hello', NULL,'World');
+--@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, NULL);
+--@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', NULL, 'Hello');
+--@ -- should fail, sql identifier cannot be NULL
+--@ select format('INSERT INTO %I VALUES(%L,%L)', NULL, 10, 'Hello');
+--@ -- check positional placeholders
+--@ select format('%1$s %3$s', 1, 2, 3);
+--@ select format('%1$s %12$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+--@ -- should fail
+--@ select format('%1$s %4$s', 1, 2, 3);
+--@ select format('%1$s %13$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+--@ select format('%0$s', 'Hello');
+--@ select format('%*0$s', 'Hello');
+--@ select format('%1$', 1);
+--@ select format('%1$1', 1);
+--@ -- check mix of positional and ordered placeholders
+--@ select format('Hello %s %1$s %s', 'World', 'Hello again');
+--@ select format('Hello %s %s, %2$s %2$s', 'World', 'Hello again');
+--@ -- check variadic labeled arguments
+--@ select format('%s, %s', variadic array['Hello','World']);
+--@ select format('%s, %s', variadic array[1, 2]);
+--@ select format('%s, %s', variadic array[true, false]);
+--@ select format('%s, %s', variadic array[true, false]::text[]);
+--@ -- check variadic with positional placeholders
+--@ select format('%2$s, %1$s', variadic array['first', 'second']);
+--@ select format('%2$s, %1$s', variadic array[1, 2]);
+--@ -- variadic argument can be array type NULL, but should not be referenced
+--@ select format('Hello', variadic NULL::int[]);
+--@ -- variadic argument allows simulating more than FUNC_MAX_ARGS parameters
+--@ select format(string_agg('%s',','), variadic array_agg(i))
+--@ from generate_series(1,200) g(i);
+--@ -- check field widths and left, right alignment
+--@ select format('>>%10s<<', 'Hello');
+--@ select format('>>%10s<<', NULL);
+--@ select format('>>%10s<<', '');
+--@ select format('>>%-10s<<', '');
+--@ select format('>>%-10s<<', 'Hello');
+--@ select format('>>%-10s<<', NULL);
+--@ select format('>>%1$10s<<', 'Hello');
+--@ select format('>>%1$-10I<<', 'Hello');
+--@ select format('>>%2$*1$L<<', 10, 'Hello');
+--@ select format('>>%2$*1$L<<', 10, NULL);
+--@ select format('>>%2$*1$L<<', -10, NULL);
+--@ select format('>>%*s<<', 10, 'Hello');
+--@ select format('>>%*1$s<<', 10, 'Hello');
+--@ select format('>>%-s<<', 'Hello');
+--@ select format('>>%10L<<', NULL);
+--@ select format('>>%2$*1$L<<', NULL, 'Hello');
+--@ select format('>>%2$*1$L<<', 0, 'Hello');