Incorporate the comand line tests fix in 5.9

Package-Manager: portage-2.2.0_alpha170