Flaky tests / lighter test queries #400

Job	Run time
Cherry-pick to release branch (${{ matrix.version }})	0s
detect-versions	-7s
	-7s

Provide feedback