diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
index c8c774d6e1..99857d3cee 100755
--- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
+++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
@@ -811,9 +811,9 @@ subtest "Handle search filters" => sub {
 
     my ( undef, undef, undef, undef, undef, $limit, $limit_cgi, $limit_desc ) = $qb->build_query_compat( undef, undef, undef, ["search_filter:$filter_id"] );
 
-    is( $limit,q{(available:true) AND ((cat) AND title:(bat) OR author:(rat)) AND itype:(("BK") OR ("MU"))},"Limit correctly formed");
+    is( $limit,q{(available:true) AND (((cat) AND title:(bat) OR author:(rat))) AND itype:(("BK") OR ("MU"))},"Limit correctly formed");
     is( $limit_cgi,"&limit=search_filter%3A$filter_id","CGI limit is not expanded");
-    is( $limit_desc,q{(available:true) AND ((cat) AND title:(bat) OR author:(rat)) AND itype:(("BK") OR ("MU"))},"Limit description is correctly expanded");
+    is( $limit_desc,q{(available:true) AND (((cat) AND title:(bat) OR author:(rat))) AND itype:(("BK") OR ("MU"))},"Limit description is correctly expanded");
 
     $filter = Koha::SearchFilter->new({
         name => "test",
@@ -824,9 +824,9 @@ subtest "Handle search filters" => sub {
 
     ( undef, undef, undef, undef, undef, $limit, $limit_cgi, $limit_desc ) = $qb->build_query_compat( undef, undef, undef, ["search_filter:$filter_id"] );
 
-    is( $limit,q{(subject:biography)},"Limit correctly formed for ccl type query");
+    is( $limit,q{((subject:biography))},"Limit correctly formed for ccl type query");
     is( $limit_cgi,"&limit=search_filter%3A$filter_id","CGI limit is not expanded");
-    is( $limit_desc,q{(subject:biography)},"Limit description is correctly handled for ccl type query");
+    is( $limit_desc,q{((subject:biography))},"Limit description is correctly handled for ccl type query");
 
 };
 
diff --git a/t/db_dependent/Koha/SearchEngine/Zebra/QueryBuilder.t b/t/db_dependent/Koha/SearchEngine/Zebra/QueryBuilder.t
index 5a8fdb8f50..df8cfce77f 100755
--- a/t/db_dependent/Koha/SearchEngine/Zebra/QueryBuilder.t
+++ b/t/db_dependent/Koha/SearchEngine/Zebra/QueryBuilder.t
@@ -116,9 +116,9 @@ subtest "Handle search filters" => sub {
 
     my ( undef, undef, undef, undef, undef, $limit, $limit_cgi, $limit_desc ) = $qb->build_query_compat( undef, undef, undef, ["search_filter:$filter_id"] );
 
-    is( $limit,q{kw=(cat) AND ti=(bat) OR au=(rat) and (mc-itype,phr=BK or mc-itype,phr=MU) and (( (allrecords,AlwaysMatches='') and (not-onloan-count,st-numeric >= 1) and (lost,st-numeric=0) ))},"Limit correctly formed");
+    is( $limit,q{(kw=(cat) AND ti=(bat) OR au=(rat)) and (mc-itype,phr=BK or mc-itype,phr=MU) and (( (allrecords,AlwaysMatches='') and (not-onloan-count,st-numeric >= 1) and (lost,st-numeric=0) ))},"Limit correctly formed");
     is( $limit_cgi,"&limit=search_filter%3A$filter_id","CGI limit is not expanded");
-    is( $limit_desc,q{kw=(cat) AND ti=(bat) OR au=(rat) and (mc-itype,phr=BK or mc-itype,phr=MU) and (( (allrecords,AlwaysMatches='') and (not-onloan-count,st-numeric >= 1) and (lost,st-numeric=0) ))},"Limit description is correctly expanded");
+    is( $limit_desc,q{(kw=(cat) AND ti=(bat) OR au=(rat)) and (mc-itype,phr=BK or mc-itype,phr=MU) and (( (allrecords,AlwaysMatches='') and (not-onloan-count,st-numeric >= 1) and (lost,st-numeric=0) ))},"Limit description is correctly expanded");
 
     $filter = Koha::SearchFilter->new({
         name => "test",
@@ -129,8 +129,8 @@ subtest "Handle search filters" => sub {
 
     ( undef, undef, undef, undef, undef, $limit, $limit_cgi, $limit_desc ) = $qb->build_query_compat( undef, undef, undef, ["search_filter:$filter_id"] );
 
-    is( $limit,q{(su=biography)},"Limit correctly formed for ccl type query");
+    is( $limit,q{((su=biography))},"Limit correctly formed for ccl type query");
     is( $limit_cgi,"&limit=search_filter%3A$filter_id","CGI limit is not expanded");
-    is( $limit_desc,q{(su=biography)},"Limit description is correctly handled for ccl type query");
+    is( $limit_desc,q{((su=biography))},"Limit description is correctly handled for ccl type query");
 
 };