installcheck fails when compute_query_id=on or pg_stat_statsement is loaded

Hello!
 
When extension  pg_stat_statsement is loaded into memory or compute_query_id=on in postgesql.conf
many of installcheck tests give errors.
The thing is that in *.out files appear lines "queryid = xxxxx" where xxxxx - some numeric value.
So 24 of 209 installcheck tests will fail.
It seems to be a normal behaviour as queryid calculation was moved into core in 
https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=5fd9dfa5f5 
but tests say that something wrong.
Create test variants is not the way, as queryid value varies randomly 
from test to test at the same enviroment.
I think this is a problem because these fake errors can mask a real errors in relevant tests.
What’s your opinion?
 
Best regards,
Anton Melnikov
Postgres Professional: http://www.postgrespro.com
The Russian Postgres Company