diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out
index 964721c70aa..64d88787632 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
 CREATE TABLE test__int( a int[] );
 \copy test__int from 'data/test__int.data'
 ANALYZE test__int;
diff --git a/contrib/intarray/sql/_int.sql b/contrib/intarray/sql/_int.sql
index efc4f1685b7..ba4c298151a 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;
 
 
 CREATE TABLE test__int( a int[] );
diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out
index 893838e1b7b..28c321a4cf1 100644
--- a/contrib/ltree/expected/ltree.out
+++ b/contrib/ltree/expected/ltree.out
@@ -1267,9 +1267,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? 
@@ -8092,13 +8089,3 @@ SELECT count(*) FROM _ltreetest WHERE t ? '{23.*.1,23.*.2}' ;
     15
 (1 row)
 
--- 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:  label string is too long
-DETAIL:  Label length is 1000, must be at most 255, at character 1001.
--- 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 ee20092d5eb..2a612e347de 100644
--- a/contrib/ltree/sql/ltree.sql
+++ b/contrib/ltree/sql/ltree.sql
@@ -246,9 +246,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';
@@ -387,11 +384,3 @@ SELECT count(*) FROM _ltreetest WHERE t ~ '23.*{1}.1' ;
 SELECT count(*) FROM _ltreetest WHERE t ~ '23.*.1' ;
 SELECT count(*) FROM _ltreetest WHERE t ~ '23.*.2' ;
 SELECT count(*) FROM _ltreetest WHERE t ? '{23.*.1,23.*.2}' ;
-
--- 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;