Fix tests failing in Gentoo#22166

hageboeck merged 3 commits into

root-project:masterroot-project/root:masterfrom

hageboeck:fixes_Gentoohageboeck/root:fixes_GentooCopy head branch name to clipboard