[client][test] Trial fix for Build #3211