diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out
index 1700dc5a89d..d0e68d0447f 100644
--- a/contrib/intarray/expected/_int.out
+++ b/contrib/intarray/expected/_int.out
@@ -398,9 +398,6 @@ SELECT '1&(2&(4&(5|!6)))'::query_int;
  1 & 2 & 4 & ( 5 | !6 )
 (1 row)
 
-SELECT (SELECT '0 | ' || string_agg(i::text, ' & ')
-        FROM generate_series(1, 17000) AS i)::query_int;
-ERROR:  query_int expression is too complex
 -- test non-error-throwing input
 SELECT str as "query_int",
        pg_input_is_valid(str,'query_int') as ok,
diff --git a/contrib/intarray/sql/_int.sql b/contrib/intarray/sql/_int.sql
index 47f751a1769..5668ab40704 100644
--- a/contrib/intarray/sql/_int.sql
+++ b/contrib/intarray/sql/_int.sql
@@ -74,8 +74,6 @@ SELECT '1&(2&(4&(5&6)))'::query_int;
 SELECT '1&2&4&5&6'::query_int;
 SELECT '1&(2&(4&(5|6)))'::query_int;
 SELECT '1&(2&(4&(5|!6)))'::query_int;
-SELECT (SELECT '0 | ' || string_agg(i::text, ' & ')
-        FROM generate_series(1, 17000) AS i)::query_int;
 
 -- test non-error-throwing input
 
diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out
index fffd3e37cb2..d2a56628475 100644
--- a/contrib/ltree/expected/ltree.out
+++ b/contrib/ltree/expected/ltree.out
@@ -1283,9 +1283,6 @@ SELECT 'tree.awdfg_qwerty'::ltree @ 'tree & aw_rw%*'::ltxtquery;
  f
 (1 row)
 
-SELECT (SELECT 'a | ' || string_agg('b', ' & ')
-        FROM generate_series(1, 17000) AS i)::ltxtquery;
-ERROR:  ltxtquery is too large
 --arrays
 SELECT '{1.2.3}'::ltree[] @> '1.2.3.4';
  ?column? 
@@ -8205,13 +8202,3 @@ FROM (VALUES ('.2.3', 'ltree'),
  !tree & aWdf@* | ltxtquery | t  |                |                                    |                          | 
 (8 rows)
 
--- Test for overflow of lquery_level.totallen, based on an lquery level with
--- many OR-variants.
-SELECT (repeat('x', 1000) || repeat('|' || repeat('x', 1000), 65))::lquery;
-ERROR:  lquery level is too large
-DETAIL:  Total size of level exceeds the maximum allowed (65535 bytes).
--- Test for overflow of lquery_level.numvar, with a set of single-char
--- variants in one level.
-SELECT (repeat('a|', 65535) || 'a')::lquery;
-ERROR:  lquery level has too many variants
-DETAIL:  Number of variants exceeds the maximum allowed (65535).
diff --git a/contrib/ltree/sql/ltree.sql b/contrib/ltree/sql/ltree.sql
index 2a6ab0de1bd..77e6958c62a 100644
--- a/contrib/ltree/sql/ltree.sql
+++ b/contrib/ltree/sql/ltree.sql
@@ -253,9 +253,6 @@ SELECT 'tree.awdfg'::ltree @ 'tree & aWdfg@'::ltxtquery;
 SELECT 'tree.awdfg_qwerty'::ltree @ 'tree & aw_qw%*'::ltxtquery;
 SELECT 'tree.awdfg_qwerty'::ltree @ 'tree & aw_rw%*'::ltxtquery;
 
-SELECT (SELECT 'a | ' || string_agg('b', ' & ')
-        FROM generate_series(1, 17000) AS i)::ltxtquery;
-
 --arrays
 
 SELECT '{1.2.3}'::ltree[] @> '1.2.3.4';
@@ -460,11 +457,3 @@ FROM (VALUES ('.2.3', 'ltree'),
              ('!tree & aWdf@*','ltxtquery'))
       AS a(str,typ),
      LATERAL pg_input_error_info(a.str, a.typ) as errinfo;
-
--- Test for overflow of lquery_level.totallen, based on an lquery level with
--- many OR-variants.
-SELECT (repeat('x', 1000) || repeat('|' || repeat('x', 1000), 65))::lquery;
-
--- Test for overflow of lquery_level.numvar, with a set of single-char
--- variants in one level.
-SELECT (repeat('a|', 65535) || 'a')::lquery;