Issue #2227483 by drkloc: Fixing test run build