diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out
index 17ffcde73e6..85113703389 100644
--- a/src/test/regress/expected/tsearch.out
+++ b/src/test/regress/expected/tsearch.out
@@ -2002,20 +2002,16 @@ to_tsquery('english','Lorem') && phraseto_tsquery('english','ullamcorper urna'),
 
 -- Edge cases with empty query
 SELECT ts_headline('english',
-'', ''::tsquery);
+'', to_tsquery('english', ''));
 NOTICE:  text-search query doesn't contain lexemes: ""
-LINE 2: '', ''::tsquery);
-            ^
  ts_headline 
 -------------
  
 (1 row)
 
 SELECT ts_headline('english',
-'foo bar', ''::tsquery);
+'foo bar', to_tsquery('english', ''));
 NOTICE:  text-search query doesn't contain lexemes: ""
-LINE 2: 'foo bar', ''::tsquery);
-                   ^
  ts_headline 
 -------------
  foo bar
diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql
index 3bed9dae801..ca5226128ca 100644
--- a/src/test/regress/sql/tsearch.sql
+++ b/src/test/regress/sql/tsearch.sql
@@ -565,9 +565,9 @@ to_tsquery('english','Lorem') && phraseto_tsquery('english','ullamcorper urna'),
 
 -- Edge cases with empty query
 SELECT ts_headline('english',
-'', ''::tsquery);
+'', to_tsquery('english', ''));
 SELECT ts_headline('english',
-'foo bar', ''::tsquery);
+'foo bar', to_tsquery('english', ''));
 
 --Rewrite sub system